summaryrefslogtreecommitdiffstats
path: root/geo-replication
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2014-05-08 16:54:00 +0530
committerVenky Shankar <vshankar@redhat.com>2014-05-09 00:03:24 -0700
commit93129e862a2dde291ddbf22fe30d955b25da6059 (patch)
treee9f3101bb4b8ee504652a95d6e32d74d5e09bd24 /geo-replication
parent26a4b5c98e9e50ace28a9bed97f04ecea262e11d (diff)
geo-rep: Loading libgfchangelog.so only while running geo-rep
In source install, libgfchangelog is installed in /usr/local/lib When glusterd runs /usr/local/libexec/glusterfs/python/gsyncd --version it fails to find library without LD_LIBRARY_PATH. This patch avoids loading library when it is run from glusterd during start. BUG: 1096026 Change-Id: I59912227ac27ff4877d947a7c8f1fe2e8c5be06e Signed-off-by: Aravinda VK <avishwan@redhat.com> Reviewed-on: http://review.gluster.org/7713 Reviewed-by: Kotresh HR <khiremat@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com> Tested-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'geo-replication')
-rw-r--r--geo-replication/syncdaemon/libgfchangelog.py5
-rw-r--r--geo-replication/syncdaemon/resource.py2
-rw-r--r--geo-replication/syncdaemon/syncdutils.py4
3 files changed, 6 insertions, 5 deletions
diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py
index 0fa32a73499..099867a511a 100644
--- a/geo-replication/syncdaemon/libgfchangelog.py
+++ b/geo-replication/syncdaemon/libgfchangelog.py
@@ -11,10 +11,7 @@
import os
from ctypes import CDLL, create_string_buffer, get_errno
from ctypes.util import find_library
-
-
-class ChangelogException(OSError):
- pass
+from syncdutils import ChangelogException
class Changes(object):
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index aaf257e9c71..f0f6692cae2 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -34,7 +34,7 @@ import syncdutils
from syncdutils import GsyncdError, select, privileged, boolify, funcode
from syncdutils import umask, entry2pb, gauxpfx, errno_wrap, lstat
from syncdutils import NoPurgeTimeAvailable, PartialHistoryAvailable
-from libgfchangelog import ChangelogException
+from syncdutils import ChangelogException
UrlRX = re.compile('\A(\w+)://([^ *?[]*)\Z')
HostRX = re.compile('[a-z\d](?:[a-z\d.-]*[a-z\d])?', re.I)
diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py
index d4ded39f562..65daeb0fe7c 100644
--- a/geo-replication/syncdaemon/syncdutils.py
+++ b/geo-replication/syncdaemon/syncdutils.py
@@ -496,3 +496,7 @@ class NoPurgeTimeAvailable(Exception):
class PartialHistoryAvailable(Exception):
pass
+
+
+class ChangelogException(OSError):
+ pass