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 #7283 from Icinga/bugfix/cluster-sync-checksum-change 

Cluster: Avoid checking for checksum length with internal files in use
This commit is contained in:
Diana Flach 2019-07-08 15:53:17 +02:00 committed by GitHub
parent 09fe570392 46287c92e6
commit 400d58f95f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -667,11 +667,7 @@ bool ApiListener::CheckConfigChange(const ConfigDirInformation& oldConfig, const
<< "' vs. new (" << newChecksums->GetLength() << "): '"
<< JsonEncode(newChecksums) << "'.";
// Different length means that either one or the other side added or removed something. */
if (oldChecksums->GetLength() != newChecksums->GetLength())
return true;
// Both dictionaries have an equal size.
// Don't check for different length, this may be influenced from internal files
ObjectLock olock(oldChecksums);
for (const Dictionary::Pair& kv : oldChecksums) {