tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-18 23:37:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

ConfigStagesHandler: Don't allow concurrent package updates anymore

Browse Source 
To prevent Icinga2 from being restarted while
one or more requests are still in progress and end up
as corrupted stages without status file and startup logs.
This commit is contained in:
Yonas Habteab 2022-03-07 17:52:08 +01:00
parent bda2849412
commit 0d4a68adc3
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/remote/configstageshandler.cpp
View File

@ -5,12 +5,15 @@
#include "remote/httputility.hpp" #include "remote/httputility.hpp"
#include "remote/filterutility.hpp" #include "remote/filterutility.hpp"
#include "base/application.hpp" #include "base/application.hpp"
#include "base/defer.hpp"
#include "base/exception.hpp" #include "base/exception.hpp"
using namespace icinga; using namespace icinga;
REGISTER_URLHANDLER("/v1/config/stages", ConfigStagesHandler); REGISTER_URLHANDLER("/v1/config/stages", ConfigStagesHandler);
std::atomic<bool> ConfigStagesHandler::m_RunningPackageUpdates (false);
bool ConfigStagesHandler::HandleRequest( bool ConfigStagesHandler::HandleRequest(
AsioTlsStream& stream, AsioTlsStream& stream,
const ApiUser::Ptr& user, const ApiUser::Ptr& user,
@ -128,12 +131,19 @@ void ConfigStagesHandler::HandlePost(
if (reload && !activate) if (reload && !activate)
BOOST_THROW_EXCEPTION(std::invalid_argument("Parameter 'reload' must be false when 'activate' is false.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Parameter 'reload' must be false when 'activate' is false."));
if (m_RunningPackageUpdates.exchange(true)) {
return HttpUtility::SendJsonError(response, params, 423,
"Conflicting request, there is already an ongoing package update in progress. Please try it again later.");
}
auto resetPackageUpdates (Shared<Defer>::Make([]() { ConfigStagesHandler::m_RunningPackageUpdates.store(false); }));
boost::mutex::scoped_lock lock(ConfigPackageUtility::GetStaticPackageMutex()); boost::mutex::scoped_lock lock(ConfigPackageUtility::GetStaticPackageMutex());
stageName = ConfigPackageUtility::CreateStage(packageName, files); stageName = ConfigPackageUtility::CreateStage(packageName, files);
/* validate the config. on success, activate stage and reload */ /* validate the config. on success, activate stage and reload */
ConfigPackageUtility::AsyncTryActivateStage(packageName, stageName, activate, reload); ConfigPackageUtility::AsyncTryActivateStage(packageName, stageName, activate, reload, resetPackageUpdates);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
return HttpUtility::SendJsonError(response, params, 500, return HttpUtility::SendJsonError(response, params, 500,
"Stage creation failed.", "Stage creation failed.",

2
lib/remote/configstageshandler.hpp
View File

@ -4,6 +4,7 @@
#define CONFIGSTAGESHANDLER_H #define CONFIGSTAGESHANDLER_H
#include "remote/httphandler.hpp" #include "remote/httphandler.hpp"
#include <atomic>
namespace icinga namespace icinga
{ {
@ -47,6 +48,7 @@ private:
const Dictionary::Ptr& params const Dictionary::Ptr& params
); );
static std::atomic<bool> m_RunningPackageUpdates;
}; };
} }