add skip rucio wf in closor and injector

Author: z4027163

Unified/closor.py

@@ -151,7 +151,7 @@ def spawn_harvesting(url, wfi , in_full):
 def closor(url, specific=None, options=None):
     if userLock(): return
     mlock  = moduleLock()
-    if mlock(): return
+    if mlock() and not options.manual: return
     up = componentInfo(soft=['mcm','wtc'])
     if not up.check(): return
 
@@ -207,7 +207,7 @@ def rank( wfn ):
 
     for iwfo,wfo in enumerate(wfs):
         if specific and not specific in wfo.name: continue
-
+        if not options.manual and 'rucio' in (wfo.name).lower(): continue
         closers.append( CloseBuster(
             wfo = wfo,
             url = url,
@@ -655,6 +655,7 @@ def close(self):
     parser.add_option('--force', help="Force pushing the workflow through", default=False,action='store_true')
     parser.add_option('--announce', help="Announce the outputs that should be announced", default=False,action='store_true')
     parser.add_option('--threads',help='Number of threads for processing workflows',default=5, type=int)
+    parser.add_option('-m','--manual', help='Manual close, bypassing lock check',action='store_true',dest='manual',default=False)
     (options,args) = parser.parse_args()
 
     spec=None

Unified/injector.py

@@ -42,6 +42,8 @@ def injector(url, options, specific):
     for wf in workflows:
         if specific and not specific in wf: continue
 
+        if not options.manual and 'rucio' in wf.lower(): continue
+
         exists = session.query(Workflow).filter(Workflow.name == wf ).first()
         if not exists:
             wfi = workflowInfo(url, wf)
@@ -143,6 +145,7 @@ def injector(url, options, specific):
     for wf in session.query(Workflow).filter(Workflow.status == 'trouble').all():
         print wf.name
         if specific and not specific in wf.name: continue
+        if not options.manual and 'rucio' in wf.lower(): continue
         print wf.name
         wfi = workflowInfo(url, wf.name )
         wl = wfi.request #getWorkLoad(url, wf.name)