diff options
Diffstat (limited to 'geo-replication')
| -rw-r--r-- | geo-replication/syncdaemon/master.py | 23 | 
1 files changed, 9 insertions, 14 deletions
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py index 5c17f96ae64..0555b95b36b 100644 --- a/geo-replication/syncdaemon/master.py +++ b/geo-replication/syncdaemon/master.py @@ -1003,13 +1003,6 @@ class GMasterChangelogMixin(GMasterCommon):                  if done:                      xtl = (int(change.split('.')[-1]) - 1, 0)                      self.upd_stime(xtl) -                    chkpt_time = gconf.configinterface.get_realtime( -                        "checkpoint") -                    checkpoint_time = 0 -                    if chkpt_time is not None: -                        checkpoint_time = int(chkpt_time) - -                    self.status.set_last_synced(xtl, checkpoint_time)                      map(self.changelog_done_func, changes)                      self.archive_and_purge_changelogs(changes) @@ -1037,13 +1030,6 @@ class GMasterChangelogMixin(GMasterCommon):                  if done:                      xtl = (int(change.split('.')[-1]) - 1, 0)                      self.upd_stime(xtl) -                    chkpt_time = gconf.configinterface.get_realtime( -                        "checkpoint") -                    checkpoint_time = 0 -                    if chkpt_time is not None: -                        checkpoint_time = int(chkpt_time) - -                    self.status.set_last_synced(xtl, checkpoint_time)                      map(self.changelog_done_func, changes)                      self.archive_and_purge_changelogs(changes)                  break @@ -1068,6 +1054,15 @@ class GMasterChangelogMixin(GMasterCommon):          if not stime == URXTIME:              self.sendmark(path, stime) +        # Update last_synced_time in status file based on stime +        chkpt_time = gconf.configinterface.get_realtime( +            "checkpoint") +        checkpoint_time = 0 +        if chkpt_time is not None: +            checkpoint_time = int(chkpt_time) + +        self.status.set_last_synced(stime, checkpoint_time) +      def update_worker_remote_node(self):          node = sys.argv[-1]          node_data = node.split("@")  | 
