From deea482deff52251f9fe39bc3bda09f58397cb06 Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Thu, 5 Jan 2012 02:01:00 +0100 Subject: geo-rep: gsyncd: fix up fallback xtime for orphans on master side Change-Id: I2fa543b4bd317e06ea621ae968300ffb7223a68a BUG: 771787 Signed-off-by: Csaba Henk Reviewed-on: http://review.gluster.com/2580 Tested-by: Gluster Build System Reviewed-by: Kaushik BV Reviewed-by: Vijay Bellur Reviewed-on: http://review.gluster.com/3103 --- xlators/features/marker/utils/syncdaemon/master.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xlators/features/marker/utils/syncdaemon/master.py b/xlators/features/marker/utils/syncdaemon/master.py index fca6fc733..8f749bc30 100644 --- a/xlators/features/marker/utils/syncdaemon/master.py +++ b/xlators/features/marker/utils/syncdaemon/master.py @@ -58,14 +58,15 @@ class GMaster(object): if isinstance(xt, int) and xt != ENODATA: return xt invalid_xtime = (xt == ENODATA or xt < self.volmark) - if invalid_xtime and opts['create']: - t = time.time() - sec = int(t) - nsec = int((t - sec) * 1000000) - xt = (sec, nsec) - rsc.server.set_xtime(path, self.uuid, xt) if invalid_xtime: - xt = opts['default_xtime'] + if opts['create']: + t = time.time() + sec = int(t) + nsec = int((t - sec) * 1000000) + xt = (sec, nsec) + rsc.server.set_xtime(path, self.uuid, xt) + else: + xt = opts['default_xtime'] return xt def __init__(self, master, slave): -- cgit