[QC-437] Do not throw if no DataSamplingPolicies are specified

knopers8 · sawenzel · commit d39deb018a6f · 2020-10-07T08:06:12.000+02:00
diff --git a/Utilities/DataSampling/CMakeLists.txt b/Utilities/DataSampling/CMakeLists.txt
@@ -34,7 +34,7 @@ o2_add_library(DataSampling
 
 # tests with input data
 
-o2_data_file(COPY test/test_DataSampling.json DESTINATION tests)
+o2_data_file(COPY test/test_DataSampling.json test/test_DataSamplingEmpty.json DESTINATION tests)
 
 o2_add_test(DataSampling NAME test_DataSampling_test_DataSampling
   SOURCES test/test_DataSampling.cxx
diff --git a/Utilities/DataSampling/src/DataSampling.cxx b/Utilities/DataSampling/src/DataSampling.cxx
@@ -38,6 +38,10 @@ std::string DataSampling::createDispatcherName()
 void DataSampling::GenerateInfrastructure(WorkflowSpec& workflow, const std::string& policiesSource, size_t threads)
 {
   std::unique_ptr<ConfigurationInterface> cfg = ConfigurationFactory::getConfiguration(policiesSource);
+  if (cfg->getRecursive("").count("dataSamplingPolicies") == 0) {
+    LOG(WARN) << "No \"dataSamplingPolicies\" structure found in the config file. If no Data Sampling is expected, then it is completely fine.";
+    return;
+  }
   auto policiesTree = cfg->getRecursive("dataSamplingPolicies");
   Dispatcher dispatcher(createDispatcherName(), policiesSource);
   DataSampling::DoGenerateInfrastructure(dispatcher, workflow, policiesTree, threads);
diff --git a/Utilities/DataSampling/test/test_DataSampling.cxx b/Utilities/DataSampling/test/test_DataSampling.cxx
@@ -216,3 +216,11 @@ BOOST_AUTO_TEST_CASE(InputSpecsForPolicy)
 
   BOOST_CHECK_EQUAL(inputs.size(), 2);
 }
+
+BOOST_AUTO_TEST_CASE(DataSamplingEmptyConfig)
+{
+  std::string configFilePath = "json:/" + std::string(getenv("O2_ROOT")) + "/share/tests/test_DataSamplingEmpty.json";
+
+  WorkflowSpec workflow;
+  BOOST_CHECK_NO_THROW(DataSampling::GenerateInfrastructure(workflow, configFilePath));
+}
diff --git a/Utilities/DataSampling/test/test_DataSamplingEmpty.json b/Utilities/DataSampling/test/test_DataSamplingEmpty.json
@@ -0,0 +1,2 @@
+{
+}
