You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2018/04/18 12:37:33 UTC

svn commit: r1829443 - in /uima/uima-ducc/branches/reliable-ducc/src/main/admin: check_ducc ducc_util.py

Author: degenaro
Date: Wed Apr 18 12:37:32 2018
New Revision: 1829443

URL: http://svn.apache.org/viewvc?rev=1829443&view=rev
Log:
UIMA-5742 Reliable DUCC
- check other head node ducc_ling.version as well as agents from master

Modified:
    uima/uima-ducc/branches/reliable-ducc/src/main/admin/check_ducc
    uima/uima-ducc/branches/reliable-ducc/src/main/admin/ducc_util.py

Modified: uima/uima-ducc/branches/reliable-ducc/src/main/admin/check_ducc
URL: http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/src/main/admin/check_ducc?rev=1829443&r1=1829442&r2=1829443&view=diff
==============================================================================
--- uima/uima-ducc/branches/reliable-ducc/src/main/admin/check_ducc (original)
+++ uima/uima-ducc/branches/reliable-ducc/src/main/admin/check_ducc Wed Apr 18 12:37:32 2018
@@ -383,6 +383,11 @@ class CheckDucc(DuccUtil):
     
                     checked[node] = node
                     self.threadpool.invoke(self.check_node, node)
+            # check backup head node(s)
+            for node in self.get_head_node_list():
+                if(not node in checked):
+                    checked[node] = node
+                    self.threadpool.invoke(self.check_node, node)
         except:
             self.threadpool.quit()
             print sys.exc_info()[0], "Exiting."

Modified: uima/uima-ducc/branches/reliable-ducc/src/main/admin/ducc_util.py
URL: http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/src/main/admin/ducc_util.py?rev=1829443&r1=1829442&r2=1829443&view=diff
==============================================================================
--- uima/uima-ducc/branches/reliable-ducc/src/main/admin/ducc_util.py (original)
+++ uima/uima-ducc/branches/reliable-ducc/src/main/admin/ducc_util.py Wed Apr 18 12:37:32 2018
@@ -606,8 +606,8 @@ class DuccUtil(DuccBase):
         debug(label, str(result))
         return result
     
-    # get all possible hostnames & ip addresses for a head node
-    def get_head_node_list_variations(self):
+    # get ducc.head.reliable.list
+    def get_head_node_list(self):
         head_node_list = []
         # add ducc.head.reliable.list node(s)
         ducc_head_list = self.ducc_properties.get("ducc.head.reliable.list")
@@ -620,6 +620,12 @@ class DuccUtil(DuccBase):
                 sys.exit(1);
             else:
                 head_node_list = ducc_head_nodes
+        return head_node_list
+    
+    # get all possible hostnames & ip addresses for a head node
+    def get_head_node_list_variations(self):
+        # start with ducc.head.reliable.list node(s)
+        head_node_list = self.get_head_node_list()
         # add ducc.head node
         ducc_head = self.ducc_properties.get("ducc.head")
         if(ducc_head == None):