Merge branch 'fwinkl20191016T152250' into 'master'

TrigPSC: Release Python GIL after fork

See merge request !27241

HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx

@@ -268,10 +268,10 @@ bool psc::Psc::configure(const ptree& config)
       // Normally this is TrigPSC/TrigPSCPythonDbSetup
       std::string pyBasicFile = m_config->getOption("PYTHONSETUPFILE") ;
       if ( pyBasicFile != "" ) {
-	if ( !psc::Utils::pyInclude(pyBasicFile) ) {
-	  ERS_PSC_ERROR("Basic Python configuration failed.");
-	  return false;
-	}
+        if ( !psc::Utils::pyInclude(pyBasicFile) ) {
+          ERS_PSC_ERROR("Basic Python configuration failed.");
+          return false;
+        }
       }
     }   
   }
@@ -657,11 +657,17 @@ bool psc::Psc::doEventLoop()
 
 bool psc::Psc::prepareWorker (const boost::property_tree::ptree& args)
 {
-  using namespace std;
   psc::Utils::ScopeTimer timer("Psc prepareWorker");
 
-  ERS_LOG("Individualizing DF properties");
+  /* Release the Python GIL (which we inherited from the mother)
+     to avoid dead-locking on the first call to Python. Only relevant
+     if Python is initialized and Python-based algorithms are used. */
+  if ( PyEval_ThreadsInitialized() ) {
+    ERS_DEBUG(1, "Releasing Python GIL");
+    PyEval_SaveThread();
+  }
 
+  ERS_LOG("Individualizing DF properties");
   m_config->prepareWorker(args);
 
   if (!setDFProperties({{"DF_Pid", "DF_PID"},

HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.cxx

@@ -163,8 +163,8 @@ StatusCode TrigCOOLUpdateHelper::resetFolder(const std::string& folder,
   }
        
   // Invalidate IOV range
-  ATH_MSG_DEBUG("Setting IOV range of " << folder << " to " << iov_range);
-    
+  ATH_MSG_DEBUG("Invalidating IOV range of " << folder << " by setting it to " << iov_range);
+
   if ((m_iovSvc->setRange(clid, key, iov_range, "StoreGateSvc")).isFailure()) {
     ATH_MSG_WARNING("Could not set IOV range for " << folder << " to " << iov_range);
     return StatusCode::FAILURE;