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
66 lines
1.4 KiB
Python
66 lines
1.4 KiB
Python
from __future__ import absolute_import, print_function
|
|
|
|
import os
|
|
import sys
|
|
|
|
# make it runnable directly without run-tests.py
|
|
sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')]
|
|
|
|
if not sys.platform.startswith('linux'):
|
|
sys.stderr.write('skipped: linux required\n')
|
|
sys.exit(80)
|
|
|
|
from hgext3rd import patchrmdir
|
|
from mercurial import util
|
|
|
|
patchrmdir.uisetup(None)
|
|
|
|
testtmp = os.environ['TESTTMP']
|
|
|
|
d1 = os.path.join(testtmp, 'd1')
|
|
d2 = os.path.join(testtmp, 'd1', 'd2')
|
|
|
|
os.mkdir(d1)
|
|
os.mkdir(d2)
|
|
|
|
def tryfunc(func):
|
|
try:
|
|
func()
|
|
except Exception as ex:
|
|
# normalize the error message across platforms
|
|
if 'Non-empty directory' not in str(ex):
|
|
ex = '*'
|
|
else:
|
|
ex = 'Non-empty directory'
|
|
print(' error: %s' % ex)
|
|
else:
|
|
print(' success')
|
|
|
|
print('rmdir d1 - should fail with ENOTEMPTY')
|
|
tryfunc(lambda: os.rmdir(d1))
|
|
|
|
print('rmdir d1/d2 - should succeed')
|
|
tryfunc(lambda: os.rmdir(d2))
|
|
|
|
open(d2, 'w').close()
|
|
|
|
print('rmdir d1 - should fail with ENOTEMPTY')
|
|
tryfunc(lambda: os.rmdir(d1))
|
|
|
|
os.unlink(d2)
|
|
|
|
print('rmdir d1 - should succeed')
|
|
tryfunc(lambda: os.rmdir(d1))
|
|
|
|
print('rmdir d1 - should fail with ENOENT')
|
|
tryfunc(lambda: os.rmdir(d1))
|
|
|
|
os.mkdir(d1)
|
|
os.mkdir(d2)
|
|
|
|
print('removedirs d2 (and d1) - should succeed')
|
|
tryfunc(lambda: util.removedirs(d2))
|
|
|
|
print('removedirs d1 - should fail with ENOENT')
|
|
tryfunc(lambda: util.removedirs(d1))
|