diff options
author | Kotresh HR <khiremat@redhat.com> | 2018-06-07 04:11:25 -0400 |
---|---|---|
committer | Kotresh HR <khiremat@redhat.com> | 2018-06-22 11:37:25 +0000 |
commit | 8a7e70a221778cd54c8bda9d6c2a522511d36ed1 (patch) | |
tree | 3545d4930bbec15d808d2d9f9a9b9598325e0bda /geo-replication/syncdaemon/syncdutils.py | |
parent | 4b7707382bc763f089e14334c2b7f3139e186c1f (diff) |
geo-rep: Fix geo-rep for older versions of unshare
Geo-rep mounts are private to worker. It uses
mount namespace using unshare command to achieve
the same. Well, the unshare command has to support
'--propagation' option. So geo-rep breaks on the
systems with older unshare version. The patch
makes it fall back to lazy umount behaviour if
the unshare does not support propagation option.
fixes: bz#1589782
Change-Id: Ia614f068aede288d63ac62fea4461b1865066054
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Diffstat (limited to 'geo-replication/syncdaemon/syncdutils.py')
-rw-r--r-- | geo-replication/syncdaemon/syncdutils.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py index ab6753ee96c..6acc9f17ad7 100644 --- a/geo-replication/syncdaemon/syncdutils.py +++ b/geo-replication/syncdaemon/syncdutils.py @@ -65,6 +65,7 @@ CHANGELOG_AGENT_SERVER_VERSION = 1.0 CHANGELOG_AGENT_CLIENT_VERSION = 1.0 NodeID = None rsync_version = None +unshare_mnt_propagation = None SPACE_ESCAPE_CHAR = "%20" NEWLINE_ESCAPE_CHAR = "%0A" PERCENTAGE_ESCAPE_CHAR = "%25" @@ -626,6 +627,22 @@ def get_master_and_slave_data_from_args(args): return (master_name, slave_data) +def unshare_propagation_supported(): + global unshare_mnt_propagation + if unshare_mnt_propagation is not None: + return unshare_mnt_propagation + + unshare_mnt_propagation = False + p = subprocess.Popen(["unshare", "--help"], + stderr=subprocess.PIPE, + stdout=subprocess.PIPE) + out, err = p.communicate() + if p.returncode == 0: + if "propagation" in out: + unshare_mnt_propagation = True + + return unshare_mnt_propagation + def get_rsync_version(rsync_cmd): global rsync_version |