diff options
author | Kotresh HR <khiremat@redhat.com> | 2017-09-21 18:11:15 -0400 |
---|---|---|
committer | Aravinda VK <avishwan@redhat.com> | 2017-11-10 05:36:22 +0000 |
commit | 0f524f0710229a7f8de3a4e1e6a2790d40f67a8e (patch) | |
tree | d938aa2ba8c0b8dc7638c2740443d2d82557a099 /geo-replication/syncdaemon/gsyncd.py | |
parent | 0fc1c562d8b8d09ec2b59bc525ec5635a21a4561 (diff) |
geo-rep: Fix rename of directory in hybrid crawl
In hybrid crawl, renames and unlink can't be
synced but directory renames can be detected.
While syncing the directory on slave, if the
gfid already exists, it should be rename.
Hence if directory gfid already exists, rename
it.
Change-Id: Ibf9f99e76a3e02795a3c2befd8cac48a5c365bb6
BUG: 1499566
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Diffstat (limited to 'geo-replication/syncdaemon/gsyncd.py')
-rw-r--r-- | geo-replication/syncdaemon/gsyncd.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/geo-replication/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py index 932e37d1124..adca0374c6c 100644 --- a/geo-replication/syncdaemon/gsyncd.py +++ b/geo-replication/syncdaemon/gsyncd.py @@ -39,7 +39,7 @@ from changelogagent import agent, Changelog from gsyncdstatus import set_monitor_status, GeorepStatus, human_time_utc from libcxattr import Xattr import struct -from syncdutils import get_master_and_slave_data_from_args, lf +from syncdutils import get_master_and_slave_data_from_args, lf, Popen ParseError = XET.ParseError if hasattr(XET, 'ParseError') else SyntaxError @@ -777,7 +777,7 @@ def main_i(): else: label = 'slave' startup(go_daemon=go_daemon, log_file=log_file, label=label) - resource.Popen.init_errhandler() + Popen.init_errhandler() if be_agent: os.setsid() |