mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
ca4723ad22
Summary: We have encountered a kernel issue where `rmdir` a non-empty directory may race with other things and hang in kernel for a long time. This patch changes `os.rmdir` to avoid `rmdir` non-empty directories. It is written in Cython calling the low-level `readdir` libc friends to make overhead minimal. Test Plan: Added a new test Reviewers: #sourcecontrol, clm, rmcelroy Reviewed By: rmcelroy Subscribers: rmcelroy, simpkins, osandov, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4716711 Tasks: 16647532 Signature: t1:4716711:1489627923:7c7432748c1fd8c070ce257bd172feebd3807f65
64 lines
1.5 KiB
Cython
64 lines
1.5 KiB
Cython
# patchrmdir.py
|
|
#
|
|
# Copyright 2017 Facebook, Inc.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
"""patch rmdir
|
|
|
|
Check if a directory is empty before trying to call rmdir on it. This works
|
|
around some kernel issues.
|
|
"""
|
|
|
|
from mercurial import (
|
|
extensions,
|
|
)
|
|
import os
|
|
import errno
|
|
|
|
cdef extern from "dirent.h":
|
|
ctypedef struct DIR
|
|
struct dirent:
|
|
pass
|
|
|
|
DIR *opendir(const char *)
|
|
dirent *readdir(DIR *)
|
|
int closedir(DIR *)
|
|
|
|
cdef int _countdir(const char *path):
|
|
"""return min(3, the number of entries inside a directory).
|
|
return -1 if the directory cannot be opened.
|
|
"""
|
|
cdef DIR *d = opendir(path)
|
|
if d == NULL:
|
|
return -1
|
|
|
|
cdef dirent *e
|
|
cdef int n = 0
|
|
while True:
|
|
e = readdir(d)
|
|
if e == NULL:
|
|
break
|
|
else:
|
|
n += 1
|
|
if n > 2:
|
|
break
|
|
closedir(d)
|
|
return n
|
|
|
|
def _rmdir(orig, path):
|
|
n = _countdir(path)
|
|
if n >= 3:
|
|
# The number 3 is because most systems have "." and "..". For systems
|
|
# without them, we fallback to the original rmdir, the behavior should
|
|
# still be correct.
|
|
# Choose a slightly different error message other than "Directory not
|
|
# empty" so the test could notice the difference.
|
|
raise OSError(errno.ENOTEMPTY, 'Non-empty directory: %r' % path)
|
|
else:
|
|
return orig(path)
|
|
|
|
def uisetup(ui):
|
|
extensions.wrapfunction(os, 'rmdir', _rmdir)
|