[QC-759] Survive if ROOT fails to merge and report object name (#8465)

knopers8 · web-flow · commit f68068b653d9 · 2022-03-30T08:36:37.000+02:00
diff --git a/Utilities/Mergers/src/MergerAlgorithm.cxx b/Utilities/Mergers/src/MergerAlgorithm.cxx
@@ -109,7 +109,7 @@ void merge(TObject* const target, TObject* const other)
       auto targetTreeSize = estimateTreeSize(targetTree);
       auto otherTreeSize = estimateTreeSize(otherTree);
       if (auto totalSize = targetTreeSize + otherTreeSize; totalSize > 100000000) {
-        LOG(warn) << "The tree '" << targetTree << "' would be larger than 100MB (" << totalSize << "B) after merging, skipping to let the system survive";
+        LOG(warn) << "The tree '" << targetTree->GetName() << "' would be larger than 100MB (" << totalSize << "B) after merging, skipping to let the system survive";
         errorCode = 0;
       } else {
         errorCode = targetTree->Merge(&otherCollection);
@@ -119,10 +119,10 @@ void merge(TObject* const target, TObject* const other)
     } else if (target->InheritsFrom(TEfficiency::Class())) {
       errorCode = reinterpret_cast<TEfficiency*>(target)->Merge(&otherCollection);
     } else {
-      LOG(warn) << "Object with type '" + std::string(target->ClassName()) + "' is not one of the mergeable types, skipping";
+      LOG(warn) << "Object '" + std::string(target->GetName()) + "' with type '" + std::string(target->ClassName()) + "' is not one of the mergeable types, skipping";
     }
     if (errorCode == -1) {
-      throw std::runtime_error("Merging object of type '" + std::string(target->ClassName()) + "' failed.");
+      LOG(error) << "Merging object '" + std::string(target->GetName()) + "' of type '" + std::string(target->ClassName()) + "' failed.";
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void merge(TObject* const target, TObject* const other)`
`109`	`109`	`auto targetTreeSize = estimateTreeSize(targetTree);`
`110`	`110`	`auto otherTreeSize = estimateTreeSize(otherTree);`
`111`	`111`	`if (auto totalSize = targetTreeSize + otherTreeSize; totalSize > 100000000) {`
`112`		`- LOG(warn) << "The tree '" << targetTree << "' would be larger than 100MB (" << totalSize << "B) after merging, skipping to let the system survive";`
	`112`	`+ LOG(warn) << "The tree '" << targetTree->GetName() << "' would be larger than 100MB (" << totalSize << "B) after merging, skipping to let the system survive";`
`113`	`113`	`errorCode = 0;`
`114`	`114`	`} else {`
`115`	`115`	`errorCode = targetTree->Merge(&otherCollection);`
`@@ -119,10 +119,10 @@ void merge(TObject* const target, TObject* const other)`
`119`	`119`	`} else if (target->InheritsFrom(TEfficiency::Class())) {`
`120`	`120`	`errorCode = reinterpret_cast<TEfficiency*>(target)->Merge(&otherCollection);`
`121`	`121`	`} else {`
`122`		`- LOG(warn) << "Object with type '" + std::string(target->ClassName()) + "' is not one of the mergeable types, skipping";`
	`122`	`+ LOG(warn) << "Object '" + std::string(target->GetName()) + "' with type '" + std::string(target->ClassName()) + "' is not one of the mergeable types, skipping";`
`123`	`123`	`}`
`124`	`124`	`if (errorCode == -1) {`
`125`		`- throw std::runtime_error("Merging object of type '" + std::string(target->ClassName()) + "' failed.");`
	`125`	`+ LOG(error) << "Merging object '" + std::string(target->GetName()) + "' of type '" + std::string(target->ClassName()) + "' failed.";`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`}`