handle exceptions from info_XDR_build_version

aerospike · May 11, 2020 · 2541e53 · 2541e53
1 parent 63f5da0
commit 2541e53
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 8 deletions.
diff --git a/lib/basiccontroller.py b/lib/basiccontroller.py
@@ -213,7 +213,10 @@ def do_dc(self, line):
         nodes_running_v49_or_lower = False
 
         for node in stats:
-            node_xdr_build_major_version = int(xdr_builds[node][0])
+            try:
+                node_xdr_build_major_version = int(xdr_builds[node][0])
+            except:
+                continue
 
             if node_xdr_build_major_version >= 5:
                 nodes_running_v5_or_higher = True
@@ -249,7 +252,10 @@ def do_xdr(self, line):
         xdr5_stats = {}
 
         for node in stats:
-            node_xdr_build_major_version = int(xdr_builds[node][0])
+            try:
+                node_xdr_build_major_version = int(xdr_builds[node][0])
+            except:
+                continue
 
             if node_xdr_build_major_version < 5:
                 old_xdr_stats[node] = stats[node]
@@ -853,7 +859,11 @@ def do_xdr(self, line):
         xdr5_stats = {}
 
         for node in xdr_stats:
-            node_xdr_build_major_version = int(xdr_builds[node][0])
+            try:
+                node_xdr_build_major_version = int(xdr_builds[node][0])
+            except:
+                continue
+
             if node_xdr_build_major_version < 5:
                 old_xdr_stats[node] = xdr_stats[node]
             else:
@@ -917,7 +927,10 @@ def do_dc(self, line):
         for dc in dc_stats.values():
 
             for node in dc:
-                node_xdr_build_major_version = int(xdr_builds[node][0])
+                try:
+                    node_xdr_build_major_version = int(xdr_builds[node][0])
+                except:
+                    continue
 
                 if node_xdr_build_major_version >= 5:
                     nodes_running_v5_or_higher = True

diff --git a/lib/client/node.py b/lib/client/node.py
@@ -328,6 +328,11 @@ def is_XDR_enabled(self):
 
         # 'enable-xdr' was removed in XDR5.0, so check that get-config:context=xdr does not return an error.
         if util.info_valid(config):
+            try:
+                xdr_enabled = config['enable-xdr']
+                return xdr_enabled == 'true'
+            except Exception:
+                pass
             return True
 
         return False

diff --git a/lib/collectinfocontroller.py b/lib/collectinfocontroller.py
@@ -151,7 +151,10 @@ def do_xdr(self, line):
 
             for xdr_node in xdr_stats[timestamp].keys():
                 xdr_enable[xdr_node] = True
-                node_xdr_build_major_version = int(builds[xdr_node][0])
+                try:
+                    node_xdr_build_major_version = int(builds[xdr_node][0])
+                except:
+                    continue
 
                 if node_xdr_build_major_version < 5:
                     old_xdr_stats[xdr_node] = xdr_stats[timestamp][xdr_node]
@@ -221,7 +224,11 @@ def do_dc(self, line):
                     pass
 
             for version in builds.values():
-                node_xdr_build_major_version = int(version[0])
+                try:
+                    node_xdr_build_major_version = int(version[0])
+                except:
+                    continue
+
                 if node_xdr_build_major_version >= 5:
                     nodes_running_v5_or_higher = True
                 else:
@@ -754,7 +761,10 @@ def do_xdr(self, line):
             for_mods = self.mods['for']
 
             for xdr_node in xdr_stats[timestamp]:
-                node_xdr_build_major_version = int(builds[xdr_node][0])
+                try:
+                    node_xdr_build_major_version = int(builds[xdr_node][0])
+                except:
+                    continue
 
                 if node_xdr_build_major_version < 5:
                     old_xdr_stats[xdr_node] = xdr_stats[timestamp][xdr_node]
@@ -814,7 +824,10 @@ def do_dc(self, line):
             nodes_running_v49_or_lower = False
 
             for version in builds.values():
-                node_xdr_build_major_version = int(version[0])
+                try:
+                    node_xdr_build_major_version = int(version[0])
+                except:
+                    continue
 
                 if node_xdr_build_major_version >= 5:
                     nodes_running_v5_or_higher = True