Merge pull request #9406 from Icinga/bugfix/handle-ignore-on-error-us…

…es-cases-properly

ConfigItem: Fix infinite recursion caused by `ignore_on_error` when …

lib/config/configitem.cpp

@@ -433,11 +433,9 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue
 		<< "Committing " << items.size() << " new items.";
 #endif /* I2_DEBUG */
 
-	for (const auto& ip : items)
-		newItems.push_back(ip.first);
-
 	std::set<Type::Ptr> types;
 	std::set<Type::Ptr> completed_types;
+	int itemsCount {0};
 
 	for (const Type::Ptr& type : Type::GetAllTypes()) {
 		if (ConfigObject::TypeInstance->IsAssignableFrom(type))
@@ -464,18 +462,32 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue
 				continue;
 
 			std::atomic<int> committed_items(0);
-			upq.ParallelFor(items, [&type, &committed_items](const ItemPair& ip) {
+			std::mutex newItemsMutex;
+
+			upq.ParallelFor(items, [&type, &committed_items, &newItems, &newItemsMutex](const ItemPair& ip) {
 				const ConfigItem::Ptr& item = ip.first;
 
 				if (item->m_Type != type)
 					return;
 
-				ip.first->Commit(ip.second);
+				if (!item->Commit(ip.second)) {
+					if (item->IsIgnoreOnError()) {
+						item->Unregister();
+					}
+
+					return;
+				}
+
 				committed_items++;
+
+				std::unique_lock<std::mutex> lock(newItemsMutex);
+				newItems.emplace_back(item);
 			});
 
 			upq.Join();
 
+			itemsCount += committed_items;
+
 			completed_types.insert(type);
 
 #ifdef I2_DEBUG
@@ -491,7 +503,7 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue
 
 #ifdef I2_DEBUG
 	Log(LogDebug, "configitem")
-		<< "Committed " << items.size() << " items.";
+		<< "Committed " << itemsCount << " items.";
 #endif /* I2_DEBUG */
 
 	completed_types.clear();