Fix for container sync not syncing last rowid

Bug 1079439 Change-Id: I1985a7176f34931ecb0f24c0289f18df5e934598
openstack · Nov 19, 2012 · 923b8b9 · 923b8b9
1 parent cb55f0c
commit 923b8b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/swift/container/sync.py b/swift/container/sync.py
@@ -291,7 +291,7 @@ def container_sync(self, path):
                     if not rows:
                         break
                     row = rows[0]
-                    if row['ROWID'] >= sync_point1:
+                    if row['ROWID'] > sync_point1:
                         break
                     key = hash_path(info['account'], info['container'],
                                     row['name'], raw_digest=True)

diff --git a/test/unit/container/test_sync.py b/test/unit/container/test_sync.py
@@ -436,7 +436,7 @@ def fake_hash_path(account, container, obj, raw_digest=False):
             fcb = FakeContainerBroker('path',
                 info={'account': 'a', 'container': 'c',
                       'x_container_sync_point1': 1,
-                      'x_container_sync_point2': -1},
+                      'x_container_sync_point2': 1},
                 metadata={'x-container-sync-to': ('http://127.0.0.1/a/c', 1),
                           'x-container-sync-key': ('key', 1)},
                 items_since=[{'ROWID': 1, 'name': 'o'}])
@@ -445,7 +445,7 @@ def fake_hash_path(account, container, obj, raw_digest=False):
             cs._myport = 1000           # Match
             cs.allowed_sync_hosts = ['127.0.0.1']
             cs.container_sync('isa.db')
-            # Succeeds because the two sync points haven't deviated enough yet
+            # Succeeds because the two sync points haven't deviated yet
             self.assertEquals(cs.container_failures, 0)
             self.assertEquals(cs.container_skips, 0)
             self.assertEquals(fcb.sync_point1, -1)