Fix server list & make configurable

DataQuality/DataQualityConfigurations/python/base_data.py

@@ -22,7 +22,7 @@ dqconfig.config         = "Collisions Data"
 dqconfig.hcfg           = os.environ.get('DQC_HCFG_COLLISIONS_RUN', "%s/collisions_run.hcfg" % hcfg_dir)
 dqconfig.hcfg_min10     = os.environ.get('DQC_HCFG_COLLISIONS_MINUTES10', "%s/collisions_minutes10.hcfg" % hcfg_dir)
 dqconfig.hcfg_min30     = os.environ.get('DQC_HCFG_COLLISIONS_MINUTES30', "%s/collisions_minutes30.hcfg" % hcfg_dir)
-dqconfig.server         = ["aiatlas039.cern.ch", "aiatlas035.cern.ch", "aiatlas133.cern.ch"] if isprod else []
+dqconfig.server         = os.environ.get('DQC_SERVERS', "aiatlas009.cern.ch,aiatlas016.cern.ch,aiatlas039.cern.ch").split(',') if isprod else []
 dqconfig.eosResultsDir  = "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/han_results/tier0/collisions/" if isprod else ""
 dqconfig.histogramCache = "/afs/cern.ch/user/a/atlasdqm/w1/histogram_web_display_cache" if isprod else ''
 dqconfig.hanResultsDir  = "/dqmdisk0/han_results/tier0/collisions" if isprod else '/afs/cern.ch/user/a/atlasdqm/dqmdisk/han_results/test'

DataQuality/DataQualityConfigurations/python/base_data_1beam.py

@@ -21,7 +21,7 @@ dqconfig.config         = "Beam"
 dqconfig.hcfg           = os.environ.get('DQC_HCFG_COLLISIONS_RUN', "%s/collisions_run.hcfg" % hcfg_dir)
 dqconfig.hcfg_min10     = os.environ.get('DQC_HCFG_COLLISIONS_MINUTES10', "%s/collisions_minutes10.hcfg" % hcfg_dir)
 dqconfig.hcfg_min30     = os.environ.get('DQC_HCFG_COLLISIONS_MINUTES30', "%s/collisions_minutes30.hcfg" % hcfg_dir)
-dqconfig.server         = ["aiatlas039.cern.ch", "aiatlas035.cern.ch", "aiatlas133.cern.ch"] if isprod else []
+dqconfig.server         = os.environ.get('DQC_SERVERS', "aiatlas009.cern.ch,aiatlas016.cern.ch,aiatlas039.cern.ch").split(',') if isprod else []
 dqconfig.eosResultsDir  = "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/han_results/tier0/collisions/" if isprod else ""
 dqconfig.histogramCache = "/afs/cern.ch/user/a/atlasdqm/w1/histogram_web_display_cache" if isprod else ''
 dqconfig.hanResultsDir  = "/dqmdisk0/han_results/tier0/Cosmics08" if isprod else '/afs/cern.ch/user/a/atlasdqm/dqmdisk/han_results/test'

DataQuality/DataQualityConfigurations/python/base_data_cos.py

@@ -21,7 +21,7 @@ dqconfig.config         = "Cosmics"
 dqconfig.hcfg           = os.environ.get('DQC_HCFG_COSMICS_RUN', "%s/cosmics_run.hcfg" % hcfg_dir)
 dqconfig.hcfg_min10     = os.environ.get('DQC_HCFG_COSMICS_MINUTES10', "%s/cosmics_minutes10.hcfg" % hcfg_dir)
 dqconfig.hcfg_min30     = os.environ.get('DQC_HCFG_COSMICS_MINUTES30', "%s/cosmics_minutes30.hcfg" % hcfg_dir)
-dqconfig.server         = ["aiatlas039.cern.ch", "aiatlas035.cern.ch", "aiatlas133.cern.ch"] if isprod else []
+dqconfig.server         = os.environ.get('DQC_SERVERS', "aiatlas009.cern.ch,aiatlas016.cern.ch,aiatlas039.cern.ch").split(',') if isprod else []
 dqconfig.eosResultsDir  = "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/han_results/tier0/collisions/" if isprod else ""
 dqconfig.histogramCache = "/afs/cern.ch/user/a/atlasdqm/w1/histogram_web_display_cache" if isprod else ''
 dqconfig.hanResultsDir  = "/dqmdisk0/han_results/tier0/Cosmics08" if isprod else '/afs/cern.ch/user/a/atlasdqm/dqmdisk/han_results/test'

DataQuality/DataQualityConfigurations/python/base_data_hi.py

@@ -22,7 +22,7 @@ dqconfig.config         = "Heavy Ion Data"
 dqconfig.hcfg           = os.environ.get('DQC_HCFG_HEAVYIONS_RUN', "%s/heavyions_run.hcfg" % hcfg_dir)
 dqconfig.hcfg_min10     = os.environ.get('DQC_HCFG_HEAVYIONS_MINUTES10', "%s/heavyions_minutes10.hcfg" % hcfg_dir)
 dqconfig.hcfg_min30     = os.environ.get('DQC_HCFG_HEAVYIONS_MINUTES30', "%s/heavyions_minutes30.hcfg" % hcfg_dir)
-dqconfig.server         = ["aiatlas039.cern.ch", "aiatlas035.cern.ch", "aiatlas133.cern.ch"] if isprod else []
+dqconfig.server         = os.environ.get('DQC_SERVERS', "aiatlas009.cern.ch,aiatlas016.cern.ch,aiatlas039.cern.ch").split(',') if isprod else []
 dqconfig.eosResultsDir  = "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/han_results/tier0/collisions/" if isprod else ""
 dqconfig.histogramCache = "/afs/cern.ch/user/a/atlasdqm/w1/histogram_web_display_cache" if isprod else ''
 dqconfig.hanResultsDir  = "/dqmdisk0/han_results/tier0/collisions" if isprod else '/afs/cern.ch/user/a/atlasdqm/dqmdisk/han_results/test'

DataQuality/DataQualityUtils/scripts/DQM_Tier0Wrapper_tf.py

@@ -45,6 +45,7 @@
 ##                      configuration file paths relative to basename
 ##     12) 'productionMode': string ('True'/'False', default: 'True')
 ##         ('True': run as if on Tier-0. 'False': Assume testing.)
+##     13) 'servers': string (e.g. 'aiatlas009.cern.ch,aiatlas039.cern.ch,aiatlas016.cern.ch')
 ##
 ## (C) N. Boelaert, L. Goossens, A. Nairz, P. Onyisi, S. Schaetzel, M. Wilson 
 ##     (April 2008 - July 2010)
@@ -291,6 +292,10 @@ def dq_combined_trf(jsonfile, outmap):
           if n_xmlrpc_tries <= MAX_XMLRPC_TRIES:
             time.sleep(20*2**n_xmlrpc_tries)
 
+    # data servers
+    if 'servers' in parmap and isinstance(parmap['servers'], str):
+      os.environ['DQC_SERVERS'] = parmap['servers']
+
     print("Job parameters:\n")
     print("  Run number:      ", runnr)
     print("  Stream name:     ", stream)