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

Config sync: Only remove files, if timestamp changed

This commit is contained in:
Noah Hilverling 2020-11-13 17:41:35 +01:00 committed by Alexander A. Klimov
parent 2d1980c10d
commit 83b4d8e69d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/remote/apilistener-filesync.cpp
View File

@ -421,6 +421,12 @@ void ApiListener::HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dic
Dictionary::Ptr productionConfig = MergeConfigUpdate(productionConfigInfo); Dictionary::Ptr productionConfig = MergeConfigUpdate(productionConfigInfo);
Dictionary::Ptr newConfig = MergeConfigUpdate(newConfigInfo); Dictionary::Ptr newConfig = MergeConfigUpdate(newConfigInfo);
bool timestampChanged = false;
if (CompareTimestampsConfigChange(productionConfig, newConfig, stageConfigZoneDir)) {
timestampChanged = true;
}
/* If we have received 'checksums' via cluster message, go for it. /* If we have received 'checksums' via cluster message, go for it.
* Otherwise do the old timestamp dance for versions < 2.11. * Otherwise do the old timestamp dance for versions < 2.11.
*/ */
@ -429,7 +435,7 @@ void ApiListener::HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dic
<< "Received configuration for zone '" << zoneName << "' from endpoint '" << "Received configuration for zone '" << zoneName << "' from endpoint '"
<< fromEndpointName << "'. Comparing the timestamp and checksums."; << fromEndpointName << "'. Comparing the timestamp and checksums.";
if (CompareTimestampsConfigChange(productionConfig, newConfig, stageConfigZoneDir)) { if (timestampChanged) {
if (CheckConfigChange(productionConfigInfo, newConfigInfo)) if (CheckConfigChange(productionConfigInfo, newConfigInfo))
configChange = true; configChange = true;
@ -446,7 +452,7 @@ void ApiListener::HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dic
<< "Received configuration update without checksums from parent endpoint " << "Received configuration update without checksums from parent endpoint "
<< fromEndpointName << ". This behaviour is deprecated. Please upgrade the parent endpoint to 2.11+"; << fromEndpointName << ". This behaviour is deprecated. Please upgrade the parent endpoint to 2.11+";
if (CompareTimestampsConfigChange(productionConfig, newConfig, stageConfigZoneDir)) { if (timestampChanged) {
configChange = true; configChange = true;
} }
@ -508,8 +514,8 @@ void ApiListener::HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dic
<< "Applying configuration file update for path '" << stageConfigZoneDir << "' (" << "Applying configuration file update for path '" << stageConfigZoneDir << "' ("
<< numBytes << " Bytes)."; << numBytes << " Bytes).";
// If the update removes a path, delete it on disk and signal a config change. if (timestampChanged) {
{ // If the update removes a path, delete it on disk and signal a config change.
ObjectLock xlock(productionConfig); ObjectLock xlock(productionConfig);
for (const Dictionary::Pair& kv : productionConfig) { for (const Dictionary::Pair& kv : productionConfig) {