diff options
| author | Csaba Henk <csaba@redhat.com> | 2012-10-30 15:54:05 +0100 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-11-28 16:54:07 -0800 |
| commit | f8c19b4c6af34b96747881bcb85cddb87484f08e (patch) | |
| tree | 5ee5f1c3ea88ef9cc8cb6b66cd9e8241b45acdd0 /xlators/features | |
| parent | fbfcb0ad2aac73c2b5ab8950770c1184352bbf24 (diff) | |
geo-rep / gsyncd,glusterd: do not hardcode socket path
... in gsyncd python code. Indeed, use the configuration
mechanism to set it suitably from glusterd.
Change-Id: I9fe2088b14d28588d1e64fe892740cc5755b8365
BUG: 868877
Signed-off-by: Csaba Henk <csaba@redhat.com>
Reviewed-on: http://review.gluster.org/4143
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/features')
| -rw-r--r-- | xlators/features/marker/utils/syncdaemon/gsyncd.py | 1 | ||||
| -rw-r--r-- | xlators/features/marker/utils/syncdaemon/master.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xlators/features/marker/utils/syncdaemon/gsyncd.py b/xlators/features/marker/utils/syncdaemon/gsyncd.py index 9e946946932..d7deca86c6b 100644 --- a/xlators/features/marker/utils/syncdaemon/gsyncd.py +++ b/xlators/features/marker/utils/syncdaemon/gsyncd.py @@ -173,6 +173,7 @@ def main_i(): op.add_option('--sync-jobs', metavar='N', type=int, default=3) op.add_option('--turns', metavar='N', type=int, default=0, help=SUPPRESS_HELP) op.add_option('--allow-network', metavar='IPS', default='') + op.add_option('--socketdir', metavar='DIR') op.add_option('--state-socket-unencoded', metavar='SOCKF', type=str, action='callback', callback=store_abs) op.add_option('--checkpoint', metavar='LABEL', default='') # tunables for failover/failback mechanism: diff --git a/xlators/features/marker/utils/syncdaemon/master.py b/xlators/features/marker/utils/syncdaemon/master.py index 336f5920711..19cb09e7be5 100644 --- a/xlators/features/marker/utils/syncdaemon/master.py +++ b/xlators/features/marker/utils/syncdaemon/master.py @@ -496,10 +496,12 @@ class GMasterBase(object): def start_checkpoint_thread(self): """prepare and start checkpoint service""" - if self.checkpoint_thread or not getattr(gconf, 'state_socket_unencoded', None): + if self.checkpoint_thread or not ( + getattr(gconf, 'state_socket_unencoded', None) and getattr(gconf, 'socketdir', None) + ): return chan = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - state_socket = "/tmp/%s.socket" % md5(gconf.state_socket_unencoded).hexdigest() + state_socket = os.path.join(gconf.socketdir, md5(gconf.state_socket_unencoded).hexdigest() + ".socket") try: os.unlink(state_socket) except: |