Benchmark termination fix - added missing break

PanDAWMS · Jan 10, 2019 · 7e4b8f8 · 7e4b8f8
1 parent 3dec733
commit 7e4b8f8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -361,6 +361,14 @@ M movers/rucio_sitemover.py (8)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+73.11:
+
+Benchmarking bug fix
+- Added missing break after benchmark termination. Previously benchmark command could not be terminated if they ran
+  for longer than the allowed time (RunJob)
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 TODO:
 
 todo: remove the explicit usages of schedconfig.lfchost and replace with an experiment specific method (getFileCatalog())

diff --git a/PILOTVERSION b/PILOTVERSION
@@ -1 +1 @@
-PICARD 73.10
+PICARD 73.11
diff --git a/RunJob.py b/RunJob.py
@@ -1910,6 +1910,7 @@ def sig2exc(sig, frm):
                 if count >= max_count:
                     benchmark_subprocess.send_signal(signal.SIGUSR1)
                     tolog("Terminated the benchmark since it ran for longer than %d s" % (max_count*_sleep))
+                    break
                 else:
                     count += 1