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

Purge stage and production directories before copying files 

The cluster-message -> production diff is still intact, we're
just taking care of unwanted/deleted files here.
This commit is contained in:
Michael Friedrich 2018-09-28 13:54:54 +02:00
parent 86108e6a1e
commit 9d53db1401
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,7 @@ bool ApiListener::UpdateConfigDir(const ConfigDirInformation& oldConfigInfo, con
<< Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", oldTimestamp) << "' (" << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", oldTimestamp) << "' ("
<< oldTimestamp << ")."; << oldTimestamp << ").";
/* TODO: Deal with recursive directories. */
ObjectLock xlock(oldConfig); ObjectLock xlock(oldConfig);
for (const Dictionary::Pair& kv : oldConfig) { for (const Dictionary::Pair& kv : oldConfig) {
if (!newConfig->Contains(kv.first)) { if (!newConfig->Contains(kv.first)) {
@ -297,6 +298,14 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
bool configChange = false; bool configChange = false;
std::vector<String> relativePaths; std::vector<String> relativePaths;
/*
* We can and must safely purge the staging directory, as the difference is taken between
* runtime production config and newly received configuration.
*/
String apiZonesStageDir = GetApiZonesStageDir();
Utility::RemoveDirRecursive(apiZonesStageDir);
Utility::MkDirP(apiZonesStageDir, 0700);
ObjectLock olock(updateV1); ObjectLock olock(updateV1);
for (const Dictionary::Pair& kv : updateV1) { for (const Dictionary::Pair& kv : updateV1) {
@ -333,7 +342,9 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
Dictionary::Ptr newConfig = kv.second; Dictionary::Ptr newConfig = kv.second;
ConfigDirInformation currentConfigInfo = LoadConfigDir(currentConfigDir); ConfigDirInformation currentConfigInfo = LoadConfigDir(currentConfigDir);
/* Move the received configuration into our stage directory first. */ /* Diff the current production configuration with the received configuration.
* If there was a change, collect a signal for later stage validation.
*/
if (UpdateConfigDir(currentConfigInfo, newConfigInfo, stageConfigDir, zoneName, relativePaths, false)) if (UpdateConfigDir(currentConfigInfo, newConfigInfo, stageConfigDir, zoneName, relativePaths, false))
configChange = true; configChange = true;
} }
@ -365,8 +376,15 @@ void ApiListener::TryActivateZonesStageCallback(const ProcessResult& pr,
/* validation went fine, copy stage and reload */ /* validation went fine, copy stage and reload */
if (pr.ExitStatus == 0) { if (pr.ExitStatus == 0) {
Log(LogInformation, "ApiListener") Log(LogInformation, "ApiListener")
<< "Config validation for stage '" << GetApiZonesStageDir() << "' was OK, copying into '" << GetApiZonesDir() << "' and triggering reload."; << "Config validation for stage '" << GetApiZonesStageDir() << "' was OK, replacing into '" << GetApiZonesDir() << "' and triggering reload.";
String apiZonesDir = GetApiZonesDir();
/* Purge production before copying stage. */
Utility::RemoveDirRecursive(apiZonesDir);
Utility::MkDirP(apiZonesDir, 0700);
/* Copy all synced configuration files from stage to production. */
for (const String& path : relativePaths) { for (const String& path : relativePaths) {
Log(LogNotice, "ApiListener") Log(LogNotice, "ApiListener")
<< "Copying file '" << path << "' from config sync staging to production zones directory."; << "Copying file '" << path << "' from config sync staging to production zones directory.";
@ -374,7 +392,7 @@ void ApiListener::TryActivateZonesStageCallback(const ProcessResult& pr,
String stagePath = GetApiZonesStageDir() + path; String stagePath = GetApiZonesStageDir() + path;
String currentPath = GetApiZonesDir() + path; String currentPath = GetApiZonesDir() + path;
Utility::MkDirP(Utility::DirName(currentPath), 0755); Utility::MkDirP(Utility::DirName(currentPath), 0700);
Utility::CopyFile(stagePath, currentPath); Utility::CopyFile(stagePath, currentPath);
} }