tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9406 from Icinga/bugfix/handle-ignore-on-error-uses-cases-properly 

ConfigItem: Fix infinite recursion caused by `ignore_on_error` when …
This commit is contained in:
Julian Brost 2022-10-13 09:56:43 +02:00 committed by GitHub
parent 91cbb856fe 400117e2f6
commit dd7009dc63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/config/configitem.cpp
View File

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