Merge remote-tracking branch 'origin/feature-hltdev' into prod-hlt

sevdokim · Nov 25, 2015 · 07b4383 · 07b4383
2 parents eb512b0 + 6479d19
commit 07b4383
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/HLT/BASE/util/ZMQDIMlumiregServer.cxx b/HLT/BASE/util/ZMQDIMlumiregServer.cxx
@@ -455,7 +455,7 @@ int AliHLTDCSPublisherServer::SetLuminosityRegion(AliLuminosityRegion& lumiRegio
     //eternal interrupt - exit
     return 0;
   }
-  if (!sockets[0].revents & ZMQ_POLLIN)
+  if (!(sockets[0].revents & ZMQ_POLLIN))
   {
     //server died, reinit socket
     HLTInfo("server not responding...");

diff --git a/HLT/BASE/util/ZMQhistViewer.cxx b/HLT/BASE/util/ZMQhistViewer.cxx
@@ -59,6 +59,7 @@ TObjArray fDrawables;
 
 TPRegexp* fSelectionRegexp = NULL;
 TString fDrawOptions;
+Bool_t fResetOnRequest = kFALSE;
 
 ULong64_t iterations=0;
 
@@ -107,13 +108,18 @@ void* run(void* arg)
     if (fZMQsocketModeIN==ZMQ_REQ)
     {
       TString request;
-      if (fSelectionRegexp) request = "select="+fSelectionRegexp->GetPattern();
       TString requestTopic;
-      if (fSelectionRegexp) requestTopic = "CONFIG";
+
+      if (fSelectionRegexp) 
+      {
+        requestTopic = "CONFIG";
+        request = "select="+fSelectionRegexp->GetPattern();
+        if (fResetOnRequest) request += " ResetOnRequest";
+        zmq_send(fZMQin, requestTopic.Data(), requestTopic.Length(), ZMQ_SNDMORE);
+        zmq_send(fZMQin, request.Data(), request.Length(), ZMQ_SNDMORE);
+      }
 
       if (fVerbose) Printf("sending request %s %s",requestTopic.Data(), request.Data());
-      zmq_send(fZMQin, requestTopic.Data(), requestTopic.Length(), ZMQ_SNDMORE);
-      zmq_send(fZMQin, request.Data(), request.Length(), ZMQ_SNDMORE);
       zmq_send(fZMQin, "", 0, ZMQ_SNDMORE);
       zmq_send(fZMQin, "", 0, 0);
     }
@@ -130,7 +136,7 @@ void* run(void* arg)
       break;
     }
 
-    if (!sockets[0].revents & ZMQ_POLLIN)
+    if (!(sockets[0].revents & ZMQ_POLLIN))
     {
       //server died
       Printf("connection timed out, server %s died?", fZMQconfigIN.Data());
@@ -315,6 +321,10 @@ int ProcessOptionString(TString arguments)
       delete fSelectionRegexp;
       fSelectionRegexp=new TPRegexp(value);
     }
+    else if (option.EqualTo("ResetOnRequest"))
+    {
+      fResetOnRequest = kTRUE;
+    }
     else if (option.EqualTo("drawoptions"))
     {
       fDrawOptions = value;

diff --git a/HLT/monitoring/MonitorSandbox.C b/HLT/monitoring/MonitorSandbox.C
@@ -697,7 +697,7 @@ void ReadEventFromHomer(int timeout = 1000000)
  */
 void FetchRunInformation(int& runNumber, TString& ctpTriggerClasses, TString& detectorList)
 {
-  const char* cmd1 = "ssh cn59 'cat $ECS_PROXY_RUNDIR/log/ECSProxy*.log | grep \"ECS-Proxy received parameter\" | sort | tail -n11 | sed -e \"s/.*ECS-Proxy received parameter //\"'";
+  const char* cmd1 = "ssh `read_nodelist.py --master $HLT_NODELIST_XML` 'cat $ECS_PROXY_RUNDIR/log/ECSProxy*.log | grep \"ECS-Proxy received parameter\" | sort | tail -n11 | sed -e \"s/.*ECS-Proxy received parameter //\"'";
 	FILE* pipe = gSystem->OpenPipe(cmd1, "r");
 	if (pipe == NULL)
 	{