diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp index 9d44db60a..bf43dd2ba 100644 --- a/lib/base/configobject.cpp +++ b/lib/base/configobject.cpp @@ -33,6 +33,7 @@ #include "base/workqueue.hpp" #include "base/context.hpp" #include "base/application.hpp" +#include #include #include #include @@ -617,7 +618,13 @@ void ConfigObject::RestoreObjects(const String& filename, int attributeTypes) void ConfigObject::StopObjects() { - for (const Type::Ptr& type : Type::GetAllTypes()) { + auto types = Type::GetAllTypes(); + + std::sort(types.begin(), types.end(), [](const Type::Ptr& a, const Type::Ptr& b) { + return a->GetActivationPriority() > b->GetActivationPriority(); + }); + + for (const Type::Ptr& type : types) { auto *dtype = dynamic_cast(type.get()); if (!dtype) diff --git a/lib/base/defer.hpp b/lib/base/defer.hpp new file mode 100644 index 000000000..05ae0b819 --- /dev/null +++ b/lib/base/defer.hpp @@ -0,0 +1,59 @@ +/****************************************************************************** + * Icinga 2 * + * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License * + * as published by the Free Software Foundation; either version 2 * + * of the License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software Foundation * + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * + ******************************************************************************/ + +#ifndef DEFER +#define DEFER + +#include +#include + +namespace icinga +{ + +/** + * An action to be executed at end of scope. + * + * @ingroup base + */ +class Defer +{ +public: + inline + Defer(std::function func) : m_Func(std::move(func)) + { + } + + Defer(const Defer&) = delete; + Defer(Defer&&) = delete; + Defer& operator=(const Defer&) = delete; + Defer& operator=(Defer&&) = delete; + + inline + ~Defer() + { + m_Func(); + } + +private: + std::function m_Func; +}; + +} + +#endif /* DEFER */ diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp index cde975b72..8878a9d29 100644 --- a/lib/checker/checkercomponent.cpp +++ b/lib/checker/checkercomponent.cpp @@ -23,6 +23,7 @@ #include "icinga/cib.hpp" #include "remote/apilistener.hpp" #include "base/configtype.hpp" +#include "base/defer.hpp" #include "base/objectlock.hpp" #include "base/utility.hpp" #include "base/perfdatavalue.hpp" @@ -73,6 +74,7 @@ void CheckerComponent::Start(bool runtimeCreated) Log(LogInformation, "CheckerComponent") << "'" << GetName() << "' started."; + m_RunningChecks.store(0); m_Thread = std::thread(std::bind(&CheckerComponent::CheckThreadProc, this)); @@ -84,9 +86,6 @@ void CheckerComponent::Start(bool runtimeCreated) void CheckerComponent::Stop(bool runtimeRemoved) { - Log(LogInformation, "CheckerComponent") - << "'" << GetName() << "' stopped."; - { boost::mutex::scoped_lock lock(m_Mutex); m_Stopped = true; @@ -96,6 +95,13 @@ void CheckerComponent::Stop(bool runtimeRemoved) m_ResultTimer->Stop(); m_Thread.join(); + while (m_RunningChecks.load()) { + Utility::Sleep(1.0 / 60.0); + } + + Log(LogInformation, "CheckerComponent") + << "'" << GetName() << "' stopped."; + ObjectImpl::Stop(runtimeRemoved); } @@ -207,6 +213,8 @@ void CheckerComponent::CheckThreadProc() Checkable::IncreasePendingChecks(); + m_RunningChecks.fetch_add(1); + Utility::QueueAsyncCallback(std::bind(&CheckerComponent::ExecuteCheckHelper, CheckerComponent::Ptr(this), checkable)); lock.lock(); @@ -215,6 +223,10 @@ void CheckerComponent::CheckThreadProc() void CheckerComponent::ExecuteCheckHelper(const Checkable::Ptr& checkable) { + Defer decrementRunningChecks ([this]{ + m_RunningChecks.fetch_sub(1); + }); + try { checkable->ExecuteCheck(); } catch (const std::exception& ex) { diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp index f69f5092e..3c2753973 100644 --- a/lib/checker/checkercomponent.hpp +++ b/lib/checker/checkercomponent.hpp @@ -25,11 +25,13 @@ #include "base/configobject.hpp" #include "base/timer.hpp" #include "base/utility.hpp" +#include #include #include #include #include #include +#include #include namespace icinga @@ -90,6 +92,7 @@ private: boost::condition_variable m_CV; bool m_Stopped{false}; std::thread m_Thread; + std::atomic m_RunningChecks; CheckableSet m_IdleCheckables; CheckableSet m_PendingCheckables; diff --git a/lib/perfdata/elasticsearchwriter.ti b/lib/perfdata/elasticsearchwriter.ti index 7cf604fb9..c3e7fc046 100644 --- a/lib/perfdata/elasticsearchwriter.ti +++ b/lib/perfdata/elasticsearchwriter.ti @@ -7,7 +7,7 @@ namespace icinga class ElasticsearchWriter : ConfigObject { - activation_priority 100; + activation_priority 80; [config, required] String host { default {{{ return "127.0.0.1"; }}} diff --git a/lib/perfdata/gelfwriter.ti b/lib/perfdata/gelfwriter.ti index d13ee55d2..92d4a2176 100644 --- a/lib/perfdata/gelfwriter.ti +++ b/lib/perfdata/gelfwriter.ti @@ -26,7 +26,7 @@ namespace icinga class GelfWriter : ConfigObject { - activation_priority 100; + activation_priority 80; [config] String host { default {{{ return "127.0.0.1"; }}} diff --git a/lib/perfdata/graphitewriter.ti b/lib/perfdata/graphitewriter.ti index b28ba87a9..4475eb184 100644 --- a/lib/perfdata/graphitewriter.ti +++ b/lib/perfdata/graphitewriter.ti @@ -26,7 +26,7 @@ namespace icinga class GraphiteWriter : ConfigObject { - activation_priority 100; + activation_priority 80; [config] String host { default {{{ return "127.0.0.1"; }}} diff --git a/lib/perfdata/influxdbwriter.ti b/lib/perfdata/influxdbwriter.ti index d2f1ba6d2..a26af6d55 100644 --- a/lib/perfdata/influxdbwriter.ti +++ b/lib/perfdata/influxdbwriter.ti @@ -26,7 +26,7 @@ namespace icinga class InfluxdbWriter : ConfigObject { - activation_priority 100; + activation_priority 80; [config, required] String host { default {{{ return "127.0.0.1"; }}} diff --git a/lib/perfdata/opentsdbwriter.ti b/lib/perfdata/opentsdbwriter.ti index 3418e1606..09d5f3ede 100644 --- a/lib/perfdata/opentsdbwriter.ti +++ b/lib/perfdata/opentsdbwriter.ti @@ -26,7 +26,7 @@ namespace icinga class OpenTsdbWriter : ConfigObject { - activation_priority 100; + activation_priority 80; [config] String host { default {{{ return "127.0.0.1"; }}} diff --git a/lib/perfdata/perfdatawriter.ti b/lib/perfdata/perfdatawriter.ti index d2ceb6899..dbd303c75 100644 --- a/lib/perfdata/perfdatawriter.ti +++ b/lib/perfdata/perfdatawriter.ti @@ -27,7 +27,7 @@ namespace icinga class PerfdataWriter : ConfigObject { - activation_priority 100; + activation_priority 80; [config] String host_perfdata_path { default {{{ return Configuration::SpoolDir + "/perfdata/host-perfdata"; }}}