ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-21 02:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

undo the effects of a patch I hadn't intended to commit, named "debugprint the values of blocks and hashes thereof; make the test data and the seg size small in order to make the debugprints easy to look at"

Browse Source 
rolling back:

Thu Sep 29 23:46:28 MDT 2011  zooko@zooko.com
  * debugprint the values of blocks and hashes thereof; make the test data and the seg size small in order to make the debugprints easy to look at

    M ./src/allmydata/mutable/publish.py -1 +2
    M ./src/allmydata/mutable/retrieve.py +3
    M ./src/allmydata/test/test_mutable.py -2 +2
This commit is contained in:
Zooko O'Whielacronx 2011-10-28 22:03:49 +00:00
parent 416701e404
commit d9c1064d42
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/allmydata/mutable/publish.py
View File

@ -25,7 +25,7 @@ from allmydata.mutable.layout import get_version_from_checkstring,\
SDMFSlotWriteProxy
KiB = 1024
DEFAULT_MAX_SEGMENT_SIZE = 64
DEFAULT_MAX_SEGMENT_SIZE = 128 * KiB
PUSHING_BLOCKS_STATE = 0
PUSHING_EVERYTHING_ELSE_STATE = 1
DONE_STATE = 2
@ -763,7 +763,6 @@ class Publish:
hashed = sharedata
block_hash = hashutil.block_hash(hashed)
self.blockhashes[shareid][segnum] = block_hash
log.msg("yyy 0 shareid: %s, segnum: %s, blockhash: %s, sharedata: %s, salt: %s" % (shareid, segnum, base32.b2a(block_hash), base32.b2a(sharedata), base32.b2a(salt),))
# find the writer for this share
writer = self.writers[shareid]
writer.put_block(sharedata, segnum, salt)

3
src/allmydata/mutable/retrieve.py
View File

@ -772,9 +772,6 @@ class Retrieve:
sharehashes[1].keys())
bht = self._block_hash_trees[reader.shnum]
for bhk, bhv in blockhashes.iteritems():
log.msg("xxx 0 blockhash: %s %s" % (bhk, base32.b2a(bhv),))
if bht.needed_hashes(segnum, include_leaf=True):
try:
bht.set_hashes(blockhashes)

4
src/allmydata/test/test_mutable.py
View File

@ -2872,7 +2872,7 @@ class Version(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin, \
self.set_up_grid()
self.c = self.g.clients[0]
self.nm = self.c.nodemaker
self.data = "test data" * 32 # about 900 KiB; MDMF
self.data = "test data" * 100000 # about 900 KiB; MDMF
self.small_data = "test data" * 10 # about 90 B; SDMF
@ -3245,7 +3245,7 @@ class Update(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin):
self.set_up_grid()
self.c = self.g.clients[0]
self.nm = self.c.nodemaker
self.data = "testdata " * 30 # about 900 KiB; MDMF
self.data = "testdata " * 100000 # about 900 KiB; MDMF
self.small_data = "test data" * 10 # about 90 B; SDMF