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

Fix failed agent checks after restarts. 

Refs #4865
This commit is contained in:
Gunnar Beutner 2014-04-15 15:56:41 +02:00
parent e32de02dea
commit 76fa54ea70
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
components/agent/agentchecktask.cpp
View File

@ -58,7 +58,7 @@ void AgentCheckTask::AgentTimerHandler(void)
double now = Utility::GetTime(); double now = Utility::GetTime();
BOOST_FOREACH(kv, l_PendingChecks) { BOOST_FOREACH(kv, l_PendingChecks) {
if (kv.second < now - 60 && kv.first->IsCheckPending()) { if (kv.second < now - 60 && kv.first->IsCheckPending() && !SendResult(kv.first, false)) {
CheckResult::Ptr cr = make_shared<CheckResult>(); CheckResult::Ptr cr = make_shared<CheckResult>();
cr->SetOutput("Agent isn't responding."); cr->SetOutput("Agent isn't responding.");
cr->SetState(ServiceCritical); cr->SetState(ServiceCritical);
@ -71,7 +71,7 @@ void AgentCheckTask::AgentTimerHandler(void)
l_PendingChecks.swap(newmap); l_PendingChecks.swap(newmap);
} }
void AgentCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr) bool AgentCheckTask::SendResult(const Checkable::Ptr& checkable, bool enqueue)
{ {
Host::Ptr host; Host::Ptr host;
Service::Ptr service; Service::Ptr service;
@ -90,14 +90,14 @@ void AgentCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResu
if (agent_identity.IsEmpty() || agent_host.IsEmpty()) { if (agent_identity.IsEmpty() || agent_host.IsEmpty()) {
Log(LogWarning, "agent", "'agent_name' and 'agent_host' must be set for agent checks."); Log(LogWarning, "agent", "'agent_name' and 'agent_host' must be set for agent checks.");
return; return false;
} }
String agent_peer_host = MacroProcessor::ResolveMacros("$agent_peer_host$", resolvers, checkable->GetLastCheckResult()); String agent_peer_host = MacroProcessor::ResolveMacros("$agent_peer_host$", resolvers, checkable->GetLastCheckResult());
String agent_peer_port = MacroProcessor::ResolveMacros("$agent_peer_port$", resolvers, checkable->GetLastCheckResult()); String agent_peer_port = MacroProcessor::ResolveMacros("$agent_peer_port$", resolvers, checkable->GetLastCheckResult());
double now = Utility::GetTime(); double now = Utility::GetTime();
BOOST_FOREACH(const AgentListener::Ptr& al, DynamicType::GetObjects<AgentListener>()) { BOOST_FOREACH(const AgentListener::Ptr& al, DynamicType::GetObjects<AgentListener>()) {
double seen = al->GetAgentSeen(agent_identity); double seen = al->GetAgentSeen(agent_identity);
@ -108,17 +108,26 @@ void AgentCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResu
if (cr) { if (cr) {
checkable->ProcessCheckResult(cr); checkable->ProcessCheckResult(cr);
return; return true;
} }
} }
{ if (enqueue) {
boost::mutex::scoped_lock lock(l_Mutex); {
l_PendingChecks[checkable] = now; boost::mutex::scoped_lock lock(l_Mutex);
l_PendingChecks[checkable] = now;
}
BOOST_FOREACH(const AgentListener::Ptr& al, DynamicType::GetObjects<AgentListener>()) {
if (!agent_peer_host.IsEmpty() && !agent_peer_port.IsEmpty())
al->AddConnection(agent_peer_host, agent_peer_port);
}
} }
BOOST_FOREACH(const AgentListener::Ptr& al, DynamicType::GetObjects<AgentListener>()) { return false;
if (!agent_peer_host.IsEmpty() && !agent_peer_port.IsEmpty()) }
al->AddConnection(agent_peer_host, agent_peer_port);
} void AgentCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr)
{
SendResult(checkable, true);
} }

2
components/agent/agentchecktask.h
View File

@ -41,6 +41,8 @@ private:
AgentCheckTask(void); AgentCheckTask(void);
static void AgentTimerHandler(void); static void AgentTimerHandler(void);
static bool SendResult(const Checkable::Ptr& checkable, bool enqueue);
}; };
} }