diff options
| -rw-r--r-- | geo-replication/syncdaemon/configinterface.py | 12 | ||||
| -rw-r--r-- | geo-replication/syncdaemon/gsyncd.py | 4 | ||||
| -rw-r--r-- | geo-replication/syncdaemon/resource.py | 6 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-geo-rep.c | 6 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 6 |
5 files changed, 27 insertions, 7 deletions
diff --git a/geo-replication/syncdaemon/configinterface.py b/geo-replication/syncdaemon/configinterface.py index b5935dfdc14..50e7aedeba6 100644 --- a/geo-replication/syncdaemon/configinterface.py +++ b/geo-replication/syncdaemon/configinterface.py @@ -78,6 +78,18 @@ CONFIGS = ( "${slavevol}/${eSlave}.status", GLUSTERD_WORKDIR + "/geo-replication/${mastervol}_${remotehost}_" "${slavevol}/monitor.status"), + ("peersrx .", + "log_file", + "${iprefix}/log/glusterfs/geo-replication-slaves/${session_owner}:${eSlave}.log", + "${iprefix}/log/glusterfs/geo-replication-slaves/${session_owner}:${local_node}${local_id}.${slavevol}.log"), + ("peersrx .", + "log_file_mbr", + "${iprefix}/log/glusterfs/geo-replication-slaves/mbr/${session_owner}:${eSlave}.log", + "${iprefix}/log/glusterfs/geo-replication-slaves/mbr/${session_owner}:${local_node}${local_id}.${slavevol}.log"), + ("peersrx .", + "gluster_log_file", + "${iprefix}/log/glusterfs/geo-replication-slaves/${session_owner}:${eSlave}.gluster.log", + "${iprefix}/log/glusterfs/geo-replication-slaves/${session_owner}:${local_node}${local_id}.${slavevol}.gluster.log") ) diff --git a/geo-replication/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py index 1cc303526be..1fd475dfba1 100644 --- a/geo-replication/syncdaemon/gsyncd.py +++ b/geo-replication/syncdaemon/gsyncd.py @@ -414,7 +414,8 @@ def main_i(): if (o.callback in (store_abs, 'store_true', None) and o.get_opt_string() not in ('--version', '--help'))] remote_tunables = ['listen', 'go_daemon', 'timeout', - 'session_owner', 'config_file', 'use_rsync_xattrs'] + 'session_owner', 'config_file', 'use_rsync_xattrs', + 'local_id', 'local_node'] rq_remote_tunables = {'listen': True} # precedence for sources of values: 1) commandline, 2) cfg file, 3) @@ -542,6 +543,7 @@ def main_i(): namedict[name + 'vol'] = x.volume if name == 'remote': namedict['remotehost'] = x.remotehost + if not 'config_file' in rconf: rconf['config_file'] = TMPL_CONFIG_FILE diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py index cbd96bbb77e..977496318da 100644 --- a/geo-replication/syncdaemon/resource.py +++ b/geo-replication/syncdaemon/resource.py @@ -1006,6 +1006,12 @@ class SlaveRemote(object): so = getattr(gconf, 'session_owner', None) if so: extra_opts += ['--session-owner', so] + li = getattr(gconf, 'local_id', None) + if li: + extra_opts += ['--local-id', li] + ln = getattr(gconf, 'local_node', None) + if ln: + extra_opts += ['--local-node', ln] if boolify(gconf.use_rsync_xattrs): extra_opts.append('--use-rsync-xattrs') po = Popen(rargs + gconf.remote_gsyncd.split() + extra_opts + diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index eed4070859a..19f7a3b4d72 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c @@ -6102,7 +6102,7 @@ create_conf_file (glusterd_conf_t *conf, char *conf_path) runinit_gsyncd_setrx (&runner, conf_path); runner_add_args (&runner, "log-file", - DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/${session_owner}:${eSlave}.log", + DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/${session_owner}:${local_node}${local_id}.${slavevol}.log", ".", NULL); RUN_GSYNCD_CMD; @@ -6110,7 +6110,7 @@ create_conf_file (glusterd_conf_t *conf, char *conf_path) runinit_gsyncd_setrx (&runner, conf_path); runner_add_args (&runner, "log-file-mbr", - DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/mbr/${session_owner}:${eSlave}.log", + DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/mbr/${session_owner}:${local_node}${local_id}.${slavevol}.log", ".", NULL); RUN_GSYNCD_CMD; @@ -6118,7 +6118,7 @@ create_conf_file (glusterd_conf_t *conf, char *conf_path) runinit_gsyncd_setrx (&runner, conf_path); runner_add_args (&runner, "gluster-log-file", - DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/${session_owner}:${eSlave}.gluster.log", + DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/${session_owner}:${local_node}${local_id}.${slavevol}.gluster.log", ".", NULL); RUN_GSYNCD_CMD; diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index ac5570404a8..18dcf10f2a3 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -803,7 +803,7 @@ configure_syncdaemon (glusterd_conf_t *conf) runinit_gsyncd_setrx (&runner, conf); runner_add_args (&runner, "log-file", - DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/${session_owner}:${eSlave}.log", + DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/${session_owner}:${local_node}${local_id}.${slavevol}.log", ".", NULL); RUN_GSYNCD_CMD; @@ -811,7 +811,7 @@ configure_syncdaemon (glusterd_conf_t *conf) runinit_gsyncd_setrx (&runner, conf); runner_add_args (&runner, "log-file-mbr", - DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/mbr/${session_owner}:${eSlave}.log", + DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/mbr/${session_owner}:${local_node}${local_id}.${slavevol}.log", ".", NULL); RUN_GSYNCD_CMD; @@ -819,7 +819,7 @@ configure_syncdaemon (glusterd_conf_t *conf) runinit_gsyncd_setrx (&runner, conf); runner_add_args (&runner, "gluster-log-file", - DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/${session_owner}:${eSlave}.gluster.log", + DEFAULT_LOG_FILE_DIRECTORY"/"GEOREP"-slaves/${session_owner}:${local_node}${local_id}.${slavevol}.gluster.log", ".", NULL); RUN_GSYNCD_CMD; |