From b6b6115a5fe7dd9ec0112fb7e811fd6a91e118ee Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 31 Jul 2015 16:19:58 +0200 Subject: [PATCH] Fix cluster check w/ immediate parent and child zone endpoints fixes #9262 --- lib/remote/apilistener.cpp | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index ea55fa459..94f94a780 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -797,16 +797,27 @@ std::pair ApiListener::GetStatus(void) Array::Ptr not_connected_endpoints = new Array(); Array::Ptr connected_endpoints = new Array(); - BOOST_FOREACH(const Endpoint::Ptr& endpoint, DynamicType::GetObjectsByType()) { - if (endpoint->GetName() == GetIdentity()) + Zone::Ptr my_zone = Zone::GetLocalZone(); + + BOOST_FOREACH(const Zone::Ptr& zone, DynamicType::GetObjectsByType()) { + /* only check endpoints in a) the same zone b) our parent zone c) immediate child zones */ + if (my_zone != zone && my_zone != zone->GetParent() && zone != my_zone->GetParent()) { + Log(LogDebug, "ApiListener") + << "Not checking connection to Zone '" << zone->GetName() << "' because it's not in the same zone, a parent or a child zone."; continue; + } - count_endpoints++; + BOOST_FOREACH(const Endpoint::Ptr& endpoint, zone->GetEndpoints()) { + if (endpoint->GetName() == GetIdentity()) + continue; - if (!endpoint->IsConnected()) - not_connected_endpoints->Add(endpoint->GetName()); - else - connected_endpoints->Add(endpoint->GetName()); + count_endpoints++; + + if (!endpoint->IsConnected()) + not_connected_endpoints->Add(endpoint->GetName()); + else + connected_endpoints->Add(endpoint->GetName()); + } } status->Set("num_endpoints", count_endpoints);