From dde054ada9023d80ce42abe82f5dc92470d10624 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 11 Jun 2019 10:27:09 +0200 Subject: When sendc fails with a timeout mark the server as timed out * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp: --- TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index 3e1f0c4f970..84620c5635e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -474,15 +474,28 @@ LiveEntry::do_ping (PortableServer::POA_ptr poa) this->server_.c_str())); } } + catch (const CORBA::TIMEOUT &ex) + { + if (ImR_Locator_i::debug () > 3) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) LiveEntry::do_ping, ") + ACE_TEXT ("sendc_ping for server <%C> threw <%C> marking as timed out\n"), + this->server_.c_str(), ex._info ().c_str ())); + } + this->release_callback (); + this->status (LS_TIMEDOUT); + } catch (const CORBA::Exception &ex) { if (ImR_Locator_i::debug () > 3) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::do_ping, ") - ACE_TEXT ("sendc_ping for server <%C> threw <%C>\n"), + ACE_TEXT ("sendc_ping for server <%C> threw <%C> marking as dead\n"), this->server_.c_str(), ex._info ().c_str ())); } + this->release_callback (); this->status (LS_DEAD); } } -- cgit v1.2.1