Merge pull request #284 from CMSCompOps/actor_multi_sites

allow to assign to all sites reading from a SE

Author: sharad1126

Unified/actor.py

@@ -555,15 +555,21 @@ def actor(url,options=None):
                 for action in actions:
                     if action.startswith('sites'):
                         if type(actions[action]) != list:
-                            assign_to_sites=[SI.SE_to_CE(actions[action])]
+                            assign_to_sites=SI.SE_to_CEs(actions[action])
                         else:
-                            assign_to_sites=list(set([SI.SE_to_CE(site) for site in actions[action]]))
+                            assign_to_sites=[]
+                            for site in actions[action]:
+                                assign_to_sites.extend( SI.SE_to_CEs(site))
+                            assign_to_sites=sorted(set(assign_to_sites))
 #                    if action.startswith('mem') and actions[action] != "" and actions[action] != 'Same' and wfi.request['RequestType'] in ['TaskChain']:
 #                        recover = False;
 #                        print  "Skipping %s for now until Allie fixes memory parameter for TaskChain ACDCs."%wfname
 #                        wfi.sendLog('actor',"Skipping %s for now until Allie fixes memory parameter for TaskChain ACDCs."%wfname)
                 if not 'sites' in actions:
-                    assign_to_sites = list(set([SI.SE_to_CE(site) for site in where_to_run[fulltaskname]]))
+                    assign_to_sites=[]
+                    for site in where_to_run[task]:
+                        assign_to_sites.extend( SI.SE_to_CEs(site))
+                    assign_to_sites=sorted(set(assign_to_sites))
                     print "Found",sorted(assign_to_sites),"as sites where to run the ACDC at, from the acdc doc of ",wfname
                 print "Going to run at",sorted(assign_to_sites)
                 if recover:

utils.py

@@ -1943,7 +1943,7 @@ def default_expiration():
             'data' : None,
             'timestamp' : time.mktime( time.gmtime()),
             'expiration' : default_expiration(),
-            'getter' : lambda : getSiteStorage('cmsweb.cern.ch'),
+            'getter' : lambda : getSiteStorage('cms-cric.cern.ch'),
             'cachefile' : None,
             'default' : ""
             }
@@ -2069,8 +2069,7 @@ def getNodeQueue(url, node):
 
 def getSiteStorage(url):
     conn = make_x509_conn(url)
-    #conn  =  httplib.HTTPSConnection(url, cert_file = os.getenv('X509_USER_PROXY'), key_file = os.getenv('X509_USER_PROXY'))
-    r1=conn.request("GET",'/sitedb/data/prod/data-processing', headers={"Accept":"*/*"})
+    r1=conn.request("GET",'/api/cms/site/query/?json&preset=data-processing', headers={"Accept":"application/json"})
     r2=conn.getresponse()
     r = json.loads(r2.read())['result']
     return r