Restore glideFactoryCredentials

glideinWMS · Dec 20, 2023 · 443e1a9 · 443e1a9
1 parent 0b874e2
commit 443e1a9
Show file tree

Hide file tree

Showing 6 changed files with 477 additions and 360 deletions.
diff --git a/factory/glideFactory.py b/factory/glideFactory.py
@@ -32,6 +32,7 @@
 
 from glideinwms.factory import (
     glideFactoryConfig,
+    glideFactoryCredentials,
     glideFactoryDowntimeLib,
     glideFactoryEntryGroup,
     glideFactoryInterface,
@@ -645,14 +646,14 @@ def _set_rlimit(soft_l=None, hard_l=None):
             # available when the Entries startup
             classads = {}
             try:
-                classads = get_globals_classads()
+                classads = glideFactoryCredentials.get_globals_classads()
             except Exception:
                 logSupport.log.error("Error occurred retrieving globals classad -- is Condor running?")
 
             for classad_key in classads:
                 classad = classads[classad_key]
                 try:
-                    glideFactoryLib.process_global(classad, glideinDescript, frontendDescript)
+                    glideFactoryCredentials.process_global(classad, glideinDescript, frontendDescript)
                 except:
                     logSupport.log.exception("Error occurred processing the globals classads: ")
 
@@ -801,21 +802,6 @@ def increase_process_limit(new_limit=10000):
         logSupport.log.info("RLIMIT_NPROC already %d, not changing to %d" % (soft, new_limit))
 
 
-def get_globals_classads(factory_collector=glideFactoryInterface.DEFAULT_VAL):
-    if factory_collector == glideFactoryInterface.DEFAULT_VAL:
-        factory_collector = glideFactoryInterface.factoryConfig.factory_collector
-
-    status_constraint = '(GlideinMyType=?="glideclientglobal")'
-
-    status = condorMonitor.CondorStatus("any", pool_name=factory_collector)
-    status.require_integrity(True)  # important, this dictates what gets submitted
-
-    status.load(status_constraint)
-
-    data = status.fetchStored()
-    return data
-
-
 ############################################################
 def main(startup_dir):
     """