diff options
| author | Kotresh HR <khiremat@redhat.com> | 2017-02-15 03:44:17 -0500 |
|---|---|---|
| committer | Aravinda VK <avishwan@redhat.com> | 2017-02-16 02:50:31 -0500 |
| commit | 267578ec0d6b29483a1bd402165ea8c388ad825e (patch) | |
| tree | e3acb300fb985fd883890456ae36db4fb024730c /geo-replication | |
| parent | 8607f22dcd1bc9b84e452ae90102fa9d345ad3db (diff) | |
geo-rep: Fix xsync crawl
If stime is set to (0, 0) on master brick root, it
is expected to do complete sync ignoring the stime
set on sub directories. But while initializing the
stime variable for comparison, it was initailized
to (-1, 0) instead of (0, 0). Fixed the same.
The stime is set to (0, 0) with the 'reset-sync-time' option
while deleting session.
'gluster vol geo-rep master fedora1::slave delete reset-sync-time'
The scenario happens when geo-rep session is deleted as above and
for some reason the session is re-established with same slave volume
after deleting data on slave volume.
Change-Id: Ie5bc8f008dead637a09495adeef5577e2b33bc90
BUG: 1422760
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Reviewed-on: https://review.gluster.org/16629
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Aravinda VK <avishwan@redhat.com>
Diffstat (limited to 'geo-replication')
| -rw-r--r-- | geo-replication/syncdaemon/master.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py index 8c60dab899c..b096bc77ebe 100644 --- a/geo-replication/syncdaemon/master.py +++ b/geo-replication/syncdaemon/master.py @@ -167,7 +167,9 @@ class NormalMixin(object): xt = _xtime_now() rsc.server.aggregated.set_xtime(path, self.uuid, xt) else: - xt = opts['default_xtime'] + zero_zero = (0, 0) + if xt != zero_zero: + xt = opts['default_xtime'] return xt def keepalive_payload_hook(self, timo, gap): |