ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 05:28:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

'tahoe debug catalog-shares': sort SIs and shnums

Browse Source 
Without this, SIs or shnums could be emitted in random order, depending upon
what the filesystem happens to return.
This commit is contained in:
Brian Warner 2011-01-17 01:59:32 -08:00
parent 5a3acc05b7
commit 980fb0b2bb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/scripts/debug.py
View File

@ -654,7 +654,7 @@ def catalog_shares(options):
# ignore nodes that have storage turned off altogether
pass
else:
for abbrevdir in abbrevs:
for abbrevdir in sorted(abbrevs):
if abbrevdir == "incoming":
continue
abbrevdir = os.path.join(d, abbrevdir)
@ -663,7 +663,7 @@ def catalog_shares(options):
# as possible.
try:
sharedirs = listdir_unicode(abbrevdir)
for si_s in sharedirs:
for si_s in sorted(sharedirs):
si_dir = os.path.join(abbrevdir, si_s)
catalog_shares_one_abbrevdir(si_s, si_dir, now, out,err)
except:
@ -672,11 +672,17 @@ def catalog_shares(options):
return 0
def _as_number(s):
try:
return int(s)
except ValueError:
return "not int"
def catalog_shares_one_abbrevdir(si_s, si_dir, now, out, err):
from allmydata.util.encodingutil import listdir_unicode, quote_output
try:
for shnum_s in listdir_unicode(si_dir):
for shnum_s in sorted(listdir_unicode(si_dir), key=_as_number):
abs_sharefile = os.path.join(si_dir, shnum_s)
assert os.path.isfile(abs_sharefile)
try: