Merge pull request #3 from CoffeaTeam/fix-schedds-and-collectors

Fixes for recently changed condor configs.
CoffeaTeam · Apr 14, 2021 · 72f6c52 · 72f6c52
2 parents 4109742 + 8f3f293
commit 72f6c52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/lpcjobqueue/condor_config b/src/lpcjobqueue/condor_config
@@ -1,7 +1,7 @@
 # This should be the only file on CMS LPC interactive machines
 
 # What should be the remote pool to query for schedds?
-FERMIHTC_REMOTE_POOL = cmssrv268.fnal.gov, cmssrv605.fnal.gov
+FERMIHTC_REMOTE_POOL = cmst1mgr1.fnal.gov, cmssrv605.fnal.gov
 
 # Collector host set to remote pool
 COLLECTOR_HOST = $(FERMIHTC_REMOTE_POOL)

diff --git a/src/lpcjobqueue/schedd.py b/src/lpcjobqueue/schedd.py
@@ -36,7 +36,8 @@ def acquire_schedd():
                 ],
                 constraint='FERMIHTC_DRAIN_LPCSCHEDD=?=FALSE && FERMIHTC_SCHEDD_TYPE=?="CMSLPC"',
             )
-            break
+            if scheddAds:
+                break
         except Exception:
             logger.debug(f"Failed to contact pool node {node}, trying others...")
             pass