Fixed issue: Incorrect number of hosts down reported

bugzilla: 1687333 tendrl-bug-id: Tendrl#1076 Signed-off-by: GowthamShanmugasundaram <gshanmug@redhat.com>
GowthamShanmugam · Jun 7, 2019 · ebb77b3 · ebb77b3
1 parent e6f20cd
commit ebb77b3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/tendrl/commons/objects/__init__.py b/tendrl/commons/objects/__init__.py
@@ -28,6 +28,7 @@ def thread_safe_method(self, *args, **kws):
 class BaseObject(object):
     def __init__(self, *args, **kwargs):
         self._ttl = None
+        self._ttl_attr = []
         self._lock = threading.RLock()
         self.hash = None
         self._rendered = None
@@ -112,7 +113,19 @@ def save(self, update=True, ttl=None):
                                 NS.publisher_id,
                                 {"message": _msg}
                             )
-                    etcd_utils.write(item['key'], item['value'], quorum=True)
+                    if self._ttl and item['name'] in self._ttl_attr:
+                        etcd_utils.write(
+                            item['key'],
+                            item['value'],
+                            quorum=True,
+                            ttl=self._ttl
+                        )
+                    else:
+                        etcd_utils.write(
+                            item['key'],
+                            item['value'],
+                            quorum=True
+                        )
         if hash_key_changed:
             data_key = self.value + '/data'
             etcd_utils.write(data_key, self.json)

diff --git a/tendrl/commons/objects/node_context/__init__.py b/tendrl/commons/objects/node_context/__init__.py
@@ -91,19 +91,15 @@ def render(self):
         return super(NodeContext, self).render()
 
     def save(self, update=True, ttl=None):
-        super(NodeContext, self).save(update)
-        status = self.value + "/status"
         if self.status == "UP" and ttl is None:
             # Set ttl always when node status in up
             ttl = int(
                 NS.config.data.get("sync_interval", 60)
             )
         if ttl:
             self._ttl = ttl
-            try:
-                etcd_utils.refresh(status, ttl)
-            except etcd.EtcdKeyNotFound:
-                pass
+            self._ttl_attr = ['status']
+        super(NodeContext, self).save(update)
 
     def on_change(self, attr, prev_value, current_value):
         if attr == "status" and "tendrl/monitor" in NS.node_context.tags: