diff options
| author | Kotresh HR <khiremat@redhat.com> | 2019-10-16 14:25:47 +0530 |
|---|---|---|
| committer | Kotresh HR <khiremat@redhat.com> | 2019-10-22 18:20:28 +0530 |
| commit | 3b6d7a1ef0ad8c50984354e941af68ca80261da7 (patch) | |
| tree | 2cb3f0a2895cba69d45419fb51bc941574c110e4 /geo-replication | |
| parent | 92c9452944c0a50f2781e85572adffc20067828f (diff) | |
geo-rep: Fix config upgrade on non-participating node
After upgrade, if the config files are of old format, it
gets migrated to new format. Monitor process migrates it.
Since monitor doesn't run on nodes where bricks are not
hosted, it doesn't get migrated there. So this patch fixes
the config upgrade on nodes which doesn't host bricks.
This happens during config either on get/set/reset.
Backport of:
> Patch: https://review.gluster.org/23555
> Change-Id: Ibade2f2310b0f3affea21a3baa1ae0eb71162cba
> Signed-off-by: Kotresh HR <khiremat@redhat.com>
> BUG: 1762220
Change-Id: Ibade2f2310b0f3affea21a3baa1ae0eb71162cba
fixes: bz#1763028
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Diffstat (limited to 'geo-replication')
| -rw-r--r-- | geo-replication/syncdaemon/gsyncd.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/geo-replication/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py index a4c6f32f135..d3c79f5692d 100644 --- a/geo-replication/syncdaemon/gsyncd.py +++ b/geo-replication/syncdaemon/gsyncd.py @@ -253,7 +253,8 @@ def main(): if args.subcmd == "slave": override_from_args = True - if args.subcmd == "monitor": + if config_file is not None and \ + args.subcmd in ["monitor", "config-get", "config-set", "config-reset"]: ret = gconf.is_config_file_old(config_file, args.master, extra_tmpl_args["slavevol"]) if ret is not None: gconf.config_upgrade(config_file, ret) |