Merge pull request #572 from CMSCompOps/comp_phedex_rm

Remove phedex check except for checkor and htmlor

Author: z4027163

Unified/checkor.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from assignSession import *
 from utils import getWorkflows, workflowInfo, getDatasetEventsAndLumis, findCustodialLocation, getDatasetEventsPerLumi, siteInfo, getDatasetPresence, campaignInfo, getWorkflowById, forceComplete, makeReplicaRequest, getDatasetSize, getDatasetFiles, sendLog, reqmgr_url, dbs_url, dbs_url_writer, display_time, checkMemory, ThreadHandler, wtcInfo
-from utils import componentInfo, unifiedConfiguration, userLock, moduleLock, dataCache, unified_url, getDatasetLumisAndFiles, getDatasetRuns, duplicateAnalyzer, invalidateFiles, findParent, do_html_in_each_module
+from utils import componentInfo, unifiedConfiguration, userLock, moduleLock, dataCache, unified_url, getDatasetLumisAndFiles, getDatasetRuns, duplicateAnalyzer, invalidateFiles, findParent, do_html_in_each_module, phedex_url
 import phedexClient
 import dbs3Client
 dbs3Client.dbs3_url = dbs_url
@@ -55,6 +55,14 @@ def checkor(url, spec=None, options=None):
     use_mcm = True
     up = componentInfo(soft=['mcm','wtc'])
     if not up.check(): return
+    #phedex check    
+    try:
+        print "checking on phedex"
+        cust = findCustodialLocation(phedex_url,'/TTJets_mtop1695_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8/RunIIWinter15GS-MCRUN2_71_V1-v1/GEN-SIM')
+    except Exception as e:
+        print "fail phedex fail"
+        return   
+
     use_mcm = up.status['mcm']
 
     now_s = time.mktime(time.gmtime())

Unified/htmlor.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from assignSession import *
 import time
-from utils import getWorkLoad, campaignInfo, siteInfo, getWorkflows, unifiedConfiguration, getPrepIDs, componentInfo, getAllAgents, sendLog, moduleLock, dataCache, agentInfo, display_time, eosFile, eosRead, StartStopInfo, remainingDatasetInfo
+from utils import getWorkLoad, campaignInfo, siteInfo, getWorkflows, unifiedConfiguration, getPrepIDs, componentInfo, getAllAgents, sendLog, moduleLock, dataCache, agentInfo, display_time, eosFile, eosRead, StartStopInfo, remainingDatasetInfo, findCustodialLocation
 import os
 import json
 from collections import defaultdict
@@ -16,6 +16,13 @@ def htmlor( caller = ""):
 
     up = componentInfo(soft=['mcm','wtc','jira'])
     if not up.check(): return 
+    #phedex check    
+    try:
+        print "checking on phedex"
+        cust = findCustodialLocation(phedex_url,'/TTJets_mtop1695_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8/RunIIWinter15GS-MCRUN2_71_V1-v1/GEN-SIM')
+    except Exception as e:
+        print "fail phedex fail"
+        return  
 
     for backup in ['statuses.json','siteInfo.json','equalizor.json']:
         print "copying",backup,"to old location"

utils.py

@@ -1061,7 +1061,7 @@ def __init__(self, block=True, mcm=None, soft=None, keep_trying=False):
             'reqmgr' : False,
             'mcm' : False,
             'dbs' : False,
-            'phedex' : False,
+#            'phedex' : False,
             'cmsr' : False,
             'wtc' : False,
             'eos' : False,
@@ -1102,11 +1102,11 @@ def check_dbs(self):
         if not blocks:
             raise Exception("dbs corrupted")
 
-    def check_phedex(self):
-        if 'testbed' in dbs_url:
-            cust = findCustodialLocation(phedex_url,'/TTJets_mtop1695_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8/RunIIWinter15GS-MCRUN2_71_V1-v1/GEN-SIM')
-        else:
-            cust = findCustodialLocation(phedex_url,'/TTJets_mtop1695_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8/RunIIWinter15GS-MCRUN2_71_V1-v1/GEN-SIM')
+#    def check_phedex(self):
+#        if 'testbed' in dbs_url:
+#            cust = findCustodialLocation(phedex_url,'/TTJets_mtop1695_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8/RunIIWinter15GS-MCRUN2_71_V1-v1/GEN-SIM')
+#        else:
+#            cust = findCustodialLocation(phedex_url,'/TTJets_mtop1695_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8/RunIIWinter15GS-MCRUN2_71_V1-v1/GEN-SIM')
 
     def check_wtc(self):
         from wtcClient import wtcClient