From f3c33eadbbc70cbe08f34365d36152268edd588c Mon Sep 17 00:00:00 2001 From: Zuul Date: Fri, 14 Apr 2023 18:18:09 +0000 Subject: [PATCH] Update git submodules * Update swift from branch 'master' to 2e89e92cb77bd5341a1a290bdfc9402b02f71ab6 - Merge "ssync: fix decoding of ts_meta when ts_data has offset" - ssync: fix decoding of ts_meta when ts_data has offset The SsyncSender encodes object file timestamps in a compact form and the SsyncReceiver decodes the timestamps and compares them to its object file set. The encoding represents the meta file timestamp as a delta from the data file timestamp, NOT INCLUDING the data file timestamp offset. Previously, the decoding was erroneously calculating the meta file timestamp as the sum of the delta plus the data file timestamp INCLUDING the offset. For example, if the SssyncSender has object file timestamps: ts_data = t0_1.data ts_meta = t1.data then the receiver would erroneously perceive that the sender has: ts_data = t0_1.data ts_meta = t1_1.data As described in the referenced bug report, this erroneous decoding could cause the SsyncReceiver to request that the SsyncSender sync an object that is already in sync, which results in a 409 Conflict at the receiver. The 409 causes the ssync session to terminate, and the same process repeats on the next attempt. Closes-Bug: #2007643 Co-Authored-By: Clay Gerrard Change-Id: I74a0aac0ac29577026743f87f4b654d85e8fcc80 --- swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift b/swift index 8e875df65a..2e89e92cb7 160000 --- a/swift +++ b/swift @@ -1 +1 @@ -Subproject commit 8e875df65a3158aeb80318c77fd06662c0ed6d52 +Subproject commit 2e89e92cb77bd5341a1a290bdfc9402b02f71ab6