mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-19 04:57:54 +00:00
'tahoe catalog-shares': add SDMF filesize to the output, update misc/find-share-anomalies.py to match
This commit is contained in:
parent
a050204833
commit
41045fba0f
@ -19,7 +19,7 @@ for catalog in sys.argv[1:]:
|
||||
chk_encodings[si][0].add( (si, kN) )
|
||||
chk_encodings[si][1].add( line )
|
||||
if pieces[0] == "SDMF":
|
||||
ftype, si, kN, ver, expiration, filename = pieces
|
||||
ftype, si, kN, size, ver, expiration, filename = pieces
|
||||
if si not in sdmf_encodings:
|
||||
sdmf_encodings[si] = (set(), set())
|
||||
sdmf_encodings[si][0].add( (si, kN) )
|
||||
|
@ -345,7 +345,7 @@ class CatalogSharesOptions(usage.Options):
|
||||
for each share it finds:
|
||||
|
||||
CHK $SI $k/$N $filesize $UEB_hash $expiration $abspath_sharefile
|
||||
SDMF $SI $k/$N $seqnum/$roothash $expiration $abspath_sharefile
|
||||
SDMF $SI $k/$N $filesize $seqnum/$roothash $expiration $abspath_sharefile
|
||||
UNKNOWN $abspath_sharefile
|
||||
|
||||
It may be useful to build up a catalog of shares from many storage servers
|
||||
@ -401,10 +401,10 @@ def describe_share(abs_sharefile, si_s, shnum_s, now, out, err):
|
||||
pubkey, signature, share_hash_chain, block_hash_tree,
|
||||
share_data, enc_privkey) = pieces
|
||||
|
||||
print >>out, "SDMF %s %d/%d #%d:%s %d %s" % (si_s, k, N, seqnum,
|
||||
idlib.b2a(root_hash),
|
||||
expiration,
|
||||
abs_sharefile)
|
||||
print >>out, "SDMF %s %d/%d %d #%d:%s %d %s" % \
|
||||
(si_s, k, N, datalen,
|
||||
seqnum, idlib.b2a(root_hash),
|
||||
expiration, abs_sharefile)
|
||||
else:
|
||||
print >>out, "UNKNOWN mutable %s" % (abs_sharefile,)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user