Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Share "Last reload attempt failed" time across Icinga process tree on *nix #8429

Merged
merged 1 commit into from
May 30, 2023
Merged

Share "Last reload attempt failed" time across Icinga process tree on *nix #8429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion lib/base/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ int Application::m_ArgC;
char **Application::m_ArgV;
double Application::m_StartTime;
bool Application::m_ScriptDebuggerEnabled = false;
double Application::m_LastReloadFailed;

#ifdef _WIN32
double Application::m_LastReloadFailed = 0;
#else /* _WIN32 */
SharedMemory<Application::AtomicTs> Application::m_LastReloadFailed (0);
#endif /* _WIN32 */

#ifdef _WIN32
static LPTOP_LEVEL_EXCEPTION_FILTER l_DefaultUnhandledExceptionFilter = nullptr;
Expand Down Expand Up @@ -1208,12 +1213,20 @@ void Application::SetScriptDebuggerEnabled(bool enabled)

double Application::GetLastReloadFailed()
{
#ifdef _WIN32
return m_LastReloadFailed;
#else /* _WIN32 */
return m_LastReloadFailed.Get().load();
#endif /* _WIN32 */
}

void Application::SetLastReloadFailed(double ts)
{
#ifdef _WIN32
m_LastReloadFailed = ts;
#else /* _WIN32 */
m_LastReloadFailed.Get().store(ts);
#endif /* _WIN32 */
}

void Application::ValidateName(const Lazy<String>& lvalue, const ValidationUtils& utils)
Expand Down
8 changes: 8 additions & 0 deletions lib/base/application.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
#define APPLICATION_H

#include "base/i2-base.hpp"
#include "base/atomic.hpp"
#include "base/application-ti.hpp"
#include "base/logger.hpp"
#include "base/configuration.hpp"
#include "base/shared-memory.hpp"
#include <iosfwd>

namespace icinga
Expand Down Expand Up @@ -137,7 +139,13 @@ class Application : public ObjectImpl<Application> {
static double m_StartTime;
static double m_MainTime;
static bool m_ScriptDebuggerEnabled;
#ifdef _WIN32
static double m_LastReloadFailed;
#else /* _WIN32 */
typedef Atomic<double> AtomicTs;
static_assert(AtomicTs::is_always_lock_free);
static SharedMemory<AtomicTs> m_LastReloadFailed;
#endif /* _WIN32 */

#ifdef _WIN32
static BOOL WINAPI CtrlHandler(DWORD type);
Expand Down
2 changes: 2 additions & 0 deletions lib/cli/daemoncommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,13 +813,15 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
break;
case -2:
Log(LogCritical, "Application", "Found error in config: reloading aborted");
Application::SetLastReloadFailed(Utility::GetTime());
break;
default:
Log(LogInformation, "Application")
<< "Reload done, old process shutting down. Child process with PID '" << nextWorker << "' is taking over.";

NotifyStatus("Shutting down old instance...");

Application::SetLastReloadFailed(0);
(void)kill(currentWorker, SIGTERM);

{
Expand Down