summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2016-11-10 12:35:30 +0530
committerAravinda VK <avishwan@redhat.com>2016-12-07 22:05:35 -0800
commita268e2865c21ec8d2b4fed26715e986cfcc66fad (patch)
tree95af34f1b78fd4393ae734b1b9d6bcae91311411
parentc4b39198df40535f589c9304fd07b06d948df2f5 (diff)
geo-rep: Do not restart workers when log-rsync-performance config change
Geo-rep restarts workers when any of the configurations changed. We don't need to restart workers if tunables like log-rsync-performance is modified. With this patch, Geo-rep workers will get new "log-rsync-performance" config automatically without restart. BUG: 1393678 Change-Id: I40ec253892ea7e70c727fa5d3c540a11e891897b Signed-off-by: Aravinda VK <avishwan@redhat.com> Reviewed-on: http://review.gluster.org/15816 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: Kotresh HR <khiremat@redhat.com>
-rw-r--r--geo-replication/syncdaemon/resource.py6
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-geo-rep.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index 2e97117c495..37b9043fc88 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -1037,7 +1037,8 @@ class SlaveRemote(object):
(boolify(gconf.sync_acls) and ['--acls'] or []) + \
['.'] + list(args)
- if gconf.log_rsync_performance:
+ if boolify(gconf.configinterface.get_realtime(
+ "log_rsync_performance")):
# use stdout=PIPE only when log_rsync_performance enabled
# Else rsync will write to stdout and nobody is their
# to consume. If PIPE is full rsync hangs.
@@ -1056,7 +1057,8 @@ class SlaveRemote(object):
for errline in stderr.strip().split("\n")[:-1]:
logging.error("SYNC Error(Rsync): %s" % errline)
- if gconf.log_rsync_performance:
+ if boolify(gconf.configinterface.get_realtime(
+ "log_rsync_performance")):
rsync_msg = []
for line in stdout.split("\n"):
if line.startswith("Number of files:") or \
diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
index 2ddaf0d411c..0de477be206 100644
--- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
+++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
@@ -81,6 +81,8 @@ static char *gsync_reserved_opts[] = {
static char *gsync_no_restart_opts[] = {
"checkpoint",
+ "log_rsync_performance",
+ "log-rsync-performance",
NULL
};