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

cluster: Fix deadlock.

This commit is contained in:
Gunnar Beutner 2013-09-17 14:32:37 +02:00
parent fa52d0ab58
commit 20ac2825e9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/cluster/clustercomponent.cpp
View File

@ -1354,6 +1354,7 @@ void ClusterComponent::MessageHandler(const Endpoint::Ptr& sender, const Diction
localConfig->Remove(hash); localConfig->Remove(hash);
} }
olock.Unlock();
ObjectLock olock2(localConfig); ObjectLock olock2(localConfig);
BOOST_FOREACH(boost::tie(key, boost::tuples::ignore), localConfig) { BOOST_FOREACH(boost::tie(key, boost::tuples::ignore), localConfig) {
@ -1362,6 +1363,7 @@ void ClusterComponent::MessageHandler(const Endpoint::Ptr& sender, const Diction
(void) unlink(path.CStr()); (void) unlink(path.CStr());
configChange = true; configChange = true;
} }
olock2.Unlock();
if (configChange) { if (configChange) {
Log(LogInformation, "cluster", "Restarting after configuration change."); Log(LogInformation, "cluster", "Restarting after configuration change.");