|
 |
887953 |
From 8e7eb94645355024a12417aa247fa3eecc586274 Mon Sep 17 00:00:00 2001
|
|
|
887953 |
From: Kotresh HR <khiremat@redhat.com>
|
|
|
887953 |
Date: Mon, 1 Oct 2018 04:37:47 -0400
|
|
|
887953 |
Subject: [PATCH 387/387] georep: Fix config set of monitor status
|
|
|
887953 |
|
|
|
887953 |
The backport of [1] introduced config set of monitor
|
|
|
887953 |
status using new config framework available in
|
|
|
887953 |
upstream but is not available in downstream. Hence
|
|
|
887953 |
introduced the issue in downstreamwhere monitor
|
|
|
887953 |
failed to start workers. Fixed the same and marking
|
|
|
887953 |
in downstream only.
|
|
|
887953 |
|
|
|
887953 |
[1] https://code.engineering.redhat.com/149760
|
|
|
887953 |
|
|
|
887953 |
|
|
|
887953 |
BUG: 1623749
|
|
|
887953 |
Change-Id: Ia80b66137d0a3b193d178859a5d3c5fca01aa623
|
|
|
887953 |
Signed-off-by: Kotresh HR <khiremat@redhat.com>
|
|
|
887953 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/151428
|
|
|
887953 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
887953 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
887953 |
---
|
|
|
887953 |
geo-replication/syncdaemon/monitor.py | 2 +-
|
|
|
887953 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
887953 |
|
|
|
887953 |
diff --git a/geo-replication/syncdaemon/monitor.py b/geo-replication/syncdaemon/monitor.py
|
|
|
887953 |
index 3451fe4..1b03d7d 100644
|
|
|
887953 |
--- a/geo-replication/syncdaemon/monitor.py
|
|
|
887953 |
+++ b/geo-replication/syncdaemon/monitor.py
|
|
|
887953 |
@@ -384,7 +384,7 @@ class Monitor(object):
|
|
|
887953 |
# It will also cause fd leaks.
|
|
|
887953 |
|
|
|
887953 |
self.lock.acquire()
|
|
|
887953 |
- set_monitor_status(gconf.get("state-file"), self.ST_STARTED)
|
|
|
887953 |
+ set_monitor_status(gconf.state_file, self.ST_STARTED)
|
|
|
887953 |
self.lock.release()
|
|
|
887953 |
for t in ta:
|
|
|
887953 |
t.join()
|
|
|
887953 |
--
|
|
|
887953 |
1.8.3.1
|
|
|
887953 |
|