componentInfo can hang indefinitely

Unified/actor.py

@@ -359,7 +359,7 @@ def actor(url,options=None):
     if mlock(): return
     if userLock('actor'): return
 
-    up = componentInfo(soft=['mcm'])
+    up = componentInfo(ignore=['mcm'])
     if not up.check(): return
 
    # CI = campaignInfo()

Unified/addHoc.py

@@ -10,7 +10,7 @@
 import random
 from JIRAClient import JIRAClient
 
-up = componentInfo(soft=['mcm','wtc','jira'])
+up = componentInfo(ignore=['mcm','wtc','jira'])
 if not up.check(): sys.exit(0)
 
 JC = JIRAClient() if up.status.get('jira',False) else None

Unified/checkor.py

@@ -84,10 +84,12 @@ def checkor(url, spec=None, options=None):
     UC = unifiedConfiguration()
 
     use_mcm = True
-    up = componentInfo(soft=['mcm', 'wtc'])
+    up = componentInfo(ignore=['mcm', 'wtc'])
     if not up.check(): return
 
-    use_mcm = up.status['mcm']
+    up_mcm = componentInfo(ignore=['wtc'])
+    up_mcm.check()
+    use_mcm = up_mcm.status['mcm']
 
     now_s = time.mktime(time.gmtime())
 
@@ -192,7 +194,7 @@ def time_point(label="", sub_lap=False, percent=None, is_end=False):
                     user = c.author.name
                     prepid = jira.fields.summary.split()[0]
                     keyword = \
-                    c.body[(c.body.find(force_complete_jira_string) + len(force_complete_jira_string)):].split()[0]
+                    c.body[(c.body.find(force_complete_jira_string) + len(force_complete_jira_string)):].split()[0] 
                     if keyword and user in actors:
                         print(user, "is force-completing", keyword, "from JIRA")
                         bypasses.append(keyword)

Unified/closor.py

@@ -124,7 +124,7 @@ def closor(url, specific=None, options=None):
     if userLock(): return
     mlock  = moduleLock()
     if mlock() and not options.manual: return
-    up = componentInfo(soft=['mcm','wtc'])
+    up = componentInfo(ignore=['mcm','wtc'])
     if not up.check(): return
 
 
@@ -511,7 +511,7 @@ def close(self):
                         wfi.sendLog('closor',"Delayed announcement of %s due to unresolved Parentage dependencies" % wfi.request['RequestName'])
                         results.append('No ParentageResolved')
 
-                if all([result in ['None',None,True] for result in results]):
+                if all([result in ['None',None,True,'No ParentageResolved'] for result in results]):
                     if not jump_the_line:
                         ## only announce if all previous are fine
                         res = reqMgrClient.announceWorkflowCascade(url, wfo.name)
@@ -527,7 +527,7 @@ def close(self):
                         results.append( res )
 
             print(results)
-            if all([result in ['None',None,True, 'No ParentageResolved'] for result in results]):
+            if all([result in ['None',None,True,'No ParentageResolved'] for result in results]):
                 if jump_the_line:
                     if not 'announced' in wfo.status:
                         self.to_status = wfo.status.replace('announce','announced')

Unified/completor.py

@@ -18,9 +18,11 @@ def completor(url, specific):
 
 
     use_mcm = True
-    up = componentInfo(soft=['mcm','wtc','jira'])
+    up = componentInfo(ignore=['mcm','wtc','jira'])
     if not up.check(): return
-    use_mcm = up.status['mcm']
+    up_mcm = componentInfo(ignore=['wtc','jira']) 
+    up_mcm.check()
+    use_mcm = up_mcm.status['mcm']
     if use_mcm:
         mcm = McMClient(dev=False)
 

Unified/equalizor.py

@@ -16,7 +16,7 @@
 
 def equalizor(url , specific = None, options=None):
 
-    up = componentInfo(soft=['mcm','wtc','jira']) 
+    up = componentInfo(ignore=['mcm','wtc','jira']) 
 
     if not specific:
     	if not up.check(): return # Only check component when running cron job with everything

Unified/htmlor.py

@@ -14,7 +14,7 @@ def htmlor( caller = ""):
     mlock = moduleLock(silent=True)
     if mlock(): return
 
-    up = componentInfo(soft=['mcm','wtc','jira'])
+    up = componentInfo(ignore=['mcm','wtc','jira'])
     if not up.check(): return  
 
     #for backup in ['statuses.json','siteInfo.json','equalizor.json']:

Unified/injector.py

@@ -16,9 +16,12 @@ def injector(url, options, specific):
     if mlock() and not options.manual: return
 
     use_mcm = True
-    up = componentInfo(soft=['mcm','wtc','jira'] )
+    up = componentInfo(ignore=['mcm','wtc','jira'] )
     if not up.check(): return
-    use_mcm = up.status['mcm']
+
+    up_mcm = componentInfo(ignore=['wtc','jira'] )
+    up_mcm.check()
+    use_mcm = up_mcm.status['mcm']
 
     UC = unifiedConfiguration()
 

Unified/invalidator.py

@@ -9,7 +9,7 @@
 
 def invalidator(url, invalid_status='INVALID'):
     use_mcm = True
-    up = componentInfo(soft=['wtc','jira'])
+    up = componentInfo(ignore=['wtc','jira'])
     if not up.check(): return
     mcm = McMClient(dev=False)
 

Unified/mappor.py

@@ -16,7 +16,7 @@
 
 def mappor(url , options=None):
 
-    up = componentInfo(soft=['mcm','wtc','jira']) 
+    up = componentInfo(ignore=['mcm','wtc','jira']) 
 
     ## define regionality site => fallback allowed. feed on an ssb metric ??
     mapping = defaultdict(list)

Unified/recoveror.py

@@ -181,7 +181,7 @@ def singleRecovery(url, task , initial, actions, do=False):
 def new_recoveror(url, specific, options=None):
     if userLock('recoveror'): return
 
-    up = componentInfo(soft=['mcm','wtc','jira'])
+    up = componentInfo(ignore=['mcm','wtc','jira'])
     if not up.check(): return
 
     CI = campaignInfo()
@@ -256,7 +256,7 @@ def new_recoveror(url, specific, options=None):
 def recoveror(url,specific,options=None):
     if userLock('recoveror'): return
 
-    up = componentInfo(soft=['mcm','wtc','jira'])
+    up = componentInfo(ignore=['mcm','wtc','jira'])
     if not up.check(): return
 
     CI = campaignInfo()

Unified/rejector.py

@@ -19,7 +19,7 @@ def rejector(url, specific, options=None):
     if options.test:
         print "Test mode - no changes propagate to the production system"
 
-    if not componentInfo(soft=['wtc','jira']).check() and not options.manual: return
+    if not componentInfo(ignore=['wtc','jira']).check() and not options.manual: return
 
     if specific and specific.startswith('/'):
         ## this is for a dataset

utils.py

@@ -466,8 +466,8 @@ def checkMemory():
 
 
 class componentInfo:
-    def __init__(self, block=True, mcm=None, soft=None, keep_trying=False, check_timeout=120):
-        self.checks = componentCheck(block, mcm, soft, keep_trying)
+    def __init__(self, block=True, mcm=None, ignore=None, keep_trying=False, check_timeout=120):
+        self.checks = componentCheck(block, mcm, ignore, keep_trying)
         self.check_timeout = check_timeout
         # start the checking
         self.checks.start()
@@ -483,6 +483,7 @@ def check(self):
                 now - check_start, self.check_timeout, self.checks.checking)
                 sendLog('componentInfo', alarm, level='critical')
                 return False
+
             print("componentInfo, ping", now, check_start, now - check_start)
             time.sleep(ping)
 
@@ -493,13 +494,13 @@ def check(self):
 
 
 class componentCheck(threading.Thread):
-    def __init__(self, block=True, mcm=None, soft=None, keep_trying=False):
+    def __init__(self, block=True, mcm=None, ignore=None, keep_trying=False):
         threading.Thread.__init__(self)
         self.daemon = True
-        if soft is None:
-            self.soft = ['mcm', 'wtc', 'mongo', 'jira']  ##components that are not mandatory
+        if ignore is None:
+            self.ignore = ['mcm', 'wtc', 'mongo', 'jira']  ##components that are not necessary
         else:
-            self.soft = soft
+            self.ignore = ignore
         self.block = block
         self.status = {
             'reqmgr': False,
@@ -581,6 +582,9 @@ def check(self):
         for component in sorted(self.status):
             ecode += 1
             self.checking = component
+            if component in self.ignore and self.ignore is not None: 
+                print("Skipping", component)
+                continue
             while True:
                 try:
                     print("checking on", component)
@@ -598,8 +602,8 @@ def check(self):
                     print(traceback.format_exc())
                     print(component, "is unreachable")
                     print(str(e))
-                    if self.block and not (self.soft and component in self.soft):
-                        self.code = ecode
+                    if self.block:
+                        self.ecode = ecode
                         return False
                     break