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

mutable/publish: use unpack_mdmf_checkstring and unpack_sdmf_checkstring instead of unpack_checkstring. fixes #1540

Browse Source
This commit is contained in:
kevan 2011-09-24 16:51:37 -07:00
parent 32262239e5
commit a911e15783
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,11 @@ from foolscap.api import eventually, fireEventually
from allmydata.mutable.common import MODE_WRITE, MODE_CHECK, \
UncoordinatedWriteError, NotEnoughServersError
from allmydata.mutable.servermap import ServerMap
from allmydata.mutable.layout import unpack_checkstring, MDMFSlotWriteProxy, \
SDMFSlotWriteProxy
from allmydata.mutable.layout import get_version_from_checkstring,\
unpack_mdmf_checkstring, \
unpack_sdmf_checkstring, \
MDMFSlotWriteProxy, \
SDMFSlotWriteProxy, MDMFCHECKSTRING
KiB = 1024
DEFAULT_MAX_SEGMENT_SIZE = 128 * KiB
@ -1101,9 +1104,14 @@ class Publish:
# use the checkstring to add information to the log message
for (shnum,readv) in read_data.items():
checkstring = readv[0]
(other_seqnum,
other_roothash,
other_salt) = unpack_checkstring(checkstring)
version = get_version_from_checkstring(checkstring)
if version == MDMF_VERSION:
(other_seqnum,
other_roothash) = unpack_mdmf_checkstring(checkstring)
else:
(other_seqnum,
other_roothash,
other_salt) = unpack_sdmf_checkstring(checkstring)
expected_version = self._servermap.version_on_peer(peerid,
shnum)
if expected_version: