*fixed RunRanger parameter bug

*using os._exit to quit the process when there is processing loop exception in anelastic or elastic.py
cmsdaq · Jan 26, 2015 · 1b32f34 · 1b32f34
1 parent 7f9c2d3
commit 1b32f34
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/python/anelastic.py b/python/anelastic.py
@@ -76,6 +76,10 @@ def run(self):
                     self.process() 
                 except (KeyboardInterrupt,Queue.Empty) as e:
                     self.emptyQueue.set() 
+                except Exception as ex:
+                    self.logger.exception(ex)
+                    self.logger.fatal("Exiting on unhandled exception")
+                    os._exit(1)
             else:
                 time.sleep(0.5)
             #allow timeout in case 'complete' file is received and lumi is not closed

diff --git a/python/elastic.py b/python/elastic.py
@@ -43,7 +43,11 @@ def run(self):
                     self.emptyQueue.clear()
                     self.process() 
                 except (KeyboardInterrupt,Queue.Empty) as e:
-                    self.emptyQueue.set() 
+                    self.emptyQueue.set()
+                except Exception as ex:
+                    self.logger.exception(ex)
+                    self.logger.fatal("Exiting on unhandled exception")
+                    os._exit(1)
             else:
                 time.sleep(0.5)
 

diff --git a/python/hltd.py b/python/hltd.py
@@ -1811,7 +1811,7 @@ def process_IN_CREATE(self, event):
                             if runtoend[0].checkQuarantinedLimit()==True:
                                 hasHigherRuns = filter(lambda x: x.runnumber>nr,run_list)
                                 if len(hasHigherRuns)>0:
-                                    runtoend[0].Shutdown()
+                                    runtoend[0].Shutdown(True)
                                 else:
                                     runs_pending_shutdown.append(nr)
                     except Exception as ex:

diff --git a/rpm/hltd-1.6.0-0.x86_64.rpm b/rpm/hltd-1.6.0-0.x86_64.rpm