Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pandaharvester/commit_timestamp.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
timestamp = "20-01-2026 13:00:32 on flin (by mightqxc)"
timestamp = "28-01-2026 09:17:13 on flin (by mightqxc)"
10 changes: 3 additions & 7 deletions pandaharvester/harvestermisc/htcondor_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@
# logger
baseLogger = core_utils.setup_logger("htcondor_utils")


# module level lock
moduleLock = threading.Lock()


# List of job ads required
CONDOR_JOB_ADS_LIST = [
"ClusterId",
Expand All @@ -59,7 +57,6 @@
"harvesterWorkerID",
]


# harvesterID
harvesterID = harvester_config.master.harvester_id

Expand Down Expand Up @@ -205,9 +202,8 @@ def condor_submit_process(mp_queue, host, jdl_map_list, tmp_log):

# === Classes ===================================================

# Condor queue cache fifo


# Condor queue cache fifo
class CondorQCacheFifo(SpecialFIFOBase, metaclass=SingletonWithID):
global_lock_id = -1

Expand Down Expand Up @@ -715,10 +711,10 @@ def submit(self, jdl_list, use_spool=False):
if self.condor_api_type == "python":
try:
# TODO: submit_with_python will meet segfault or c++ error after many times of submission; need help from condor team
# TODO: submit_with_python_proces has no such error but spawns some processes that will not terminate after harvester stops
# TODO: submit_with_python_process has no such error but spawns some processes that will not terminate after harvester stops
# TODO: Fall back to submit_with_command for now
# retVal = self.submit_with_python(jdl_list, use_spool)
# retVal = self.submit_with_python_proces(jdl_list, use_spool)
# retVal = self.submit_with_python_process(jdl_list, use_spool)
retVal = self.submit_with_command(jdl_list, use_spool)
except Exception as e:
tmpLog.error(f"Exception {e.__class__.__name__}: {e}")
Expand Down