mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

up2k: fix hs after bitflips / net-glitch

Browse source 
chunk stitching could cause handshakes to initiate
a new upload rather than resume an ongoing one
This commit is contained in:
ed 2024-10-11 19:48:44 +00:00
parent 6adc778d62
commit 4a4ec88d00
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
copyparty/httpcli.py
View file

@ -2421,13 +2421,13 @@ class HttpCli(object):
finally: finally:
if locked: if locked:
# now block until all chunks released+confirmed # now block until all chunks released+confirmed
x = broker.ask("up2k.confirm_chunks", ptop, wark, locked) x = broker.ask("up2k.confirm_chunks", ptop, wark, written, locked)
num_left, t = x.get() num_left, t = x.get()
if num_left < 0: if num_left < 0:
self.loud_reply(t, status=500) self.loud_reply(t, status=500)
return False return False
t = "got %d more chunks, %d left" t = "got %d more chunks, %d left"
self.log(t % (len(locked), num_left), 6) self.log(t % (len(written), num_left), 6)
if num_left < 0: if num_left < 0:
raise Pebkac(500, "unconfirmed; see serverlog") raise Pebkac(500, "unconfirmed; see serverlog")

12
copyparty/up2k.py
View file

@ -3451,19 +3451,19 @@ class Up2k(object):
self.mutex.release() self.mutex.release()
return -1, "" return -1, ""
try: try:
return self._confirm_chunks(ptop, wark, chashes) return self._confirm_chunks(ptop, wark, chashes, chashes)
finally: finally:
self.reg_mutex.release() self.reg_mutex.release()
self.mutex.release() self.mutex.release()
def confirm_chunks( def confirm_chunks(
self, ptop: str, wark: str, chashes: list[str] self, ptop: str, wark: str, written: list[str], locked: list[str]
) -> tuple[int, str]: ) -> tuple[int, str]:
with self.mutex, self.reg_mutex: with self.mutex, self.reg_mutex:
return self._confirm_chunks(ptop, wark, chashes) return self._confirm_chunks(ptop, wark, written, locked)
def _confirm_chunks( def _confirm_chunks(
self, ptop: str, wark: str, chashes: list[str] self, ptop: str, wark: str, written: list[str], locked: list[str]
) -> tuple[int, str]: ) -> tuple[int, str]:
if True: if True:
self.db_act = self.vol_act[ptop] = time.time() self.db_act = self.vol_act[ptop] = time.time()
@ -3475,11 +3475,11 @@ class Up2k(object):
except Exception as ex: except Exception as ex:
return -2, "confirm_chunk, wark(%r)" % (ex,) # type: ignore return -2, "confirm_chunk, wark(%r)" % (ex,) # type: ignore
for chash in chashes: for chash in locked:
job["busy"].pop(chash, None) job["busy"].pop(chash, None)
try: try:
for chash in chashes: for chash in written:
job["need"].remove(chash) job["need"].remove(chash)
except Exception as ex: except Exception as ex:
return -2, "confirm_chunk, chash(%s) %r" % (chash, ex) # type: ignore return -2, "confirm_chunk, chash(%s) %r" % (chash, ex) # type: ignore

2
docs/notes.sh
View file

@ -257,6 +257,8 @@ for d in /usr /var; do find $d -type f -size +30M 2>/dev/null; done | while IFS=
# up2k worst-case testfiles: create 64 GiB (256 x 256 MiB) of sparse files; each file takes 1 MiB disk space; each 1 MiB chunk is globally unique # up2k worst-case testfiles: create 64 GiB (256 x 256 MiB) of sparse files; each file takes 1 MiB disk space; each 1 MiB chunk is globally unique
for f in {0..255}; do echo $f; truncate -s 256M $f; b1=$(printf '%02x' $f); for o in {0..255}; do b2=$(printf '%02x' $o); printf "\x$b1\x$b2" | dd of=$f bs=2 seek=$((o*1024*1024)) conv=notrunc 2>/dev/null; done; done for f in {0..255}; do echo $f; truncate -s 256M $f; b1=$(printf '%02x' $f); for o in {0..255}; do b2=$(printf '%02x' $o); printf "\x$b1\x$b2" | dd of=$f bs=2 seek=$((o*1024*1024)) conv=notrunc 2>/dev/null; done; done
# create 6.06G file with 16 bytes of unique data at start+end of each 32M chunk
sz=6509559808; truncate -s $sz f; csz=33554432; sz=$((sz/16)); step=$((csz/16)); ofs=0; while [ $ofs -lt $sz ]; do dd if=/dev/urandom of=f bs=16 count=2 seek=$ofs conv=notrunc iflag=fullblock; [ $ofs = 0 ] && ofs=$((ofs+step-1)) || ofs=$((ofs+step)); done
# py2 on osx # py2 on osx
brew install python@2 brew install python@2