diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2014-10-30 13:58:53 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2014-10-30 13:58:53 +0000 |
| commit | aa8019011bf400ea1f049feb6699788c291ac136 (patch) | |
| tree | 850f3349d95a85108edd0189e0e37948499e9060 /TAO/bin | |
| parent | 0d94d24430af1219e2a1c0ecd8dad500fc8a3492 (diff) | |
| download | ATCD-aa8019011bf400ea1f049feb6699788c291ac136.tar.gz | |
Thu Oct 30 13:55:13 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/ImplRepo_Service/AsyncAccessManager.h:
* orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
* orbsvcs/ImplRepo_Service/ImR_Locator.idl:
* orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
* orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
* orbsvcs/ImplRepo_Service/Locator_Options.h:
* orbsvcs/ImplRepo_Service/Locator_Options.cpp:
* orbsvcs/ImplRepo_Service/Server_Info.h:
* orbsvcs/ImplRepo_Service/Server_Info.cpp:
* orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp:
Reintroduced the restart attempt limiting. In conditions where
implicit restarting is allowed (ie not MANUAL mode), the locator
will honor the specified start limit. This will result in a
TRANSIENT exception to the client and the count is reset. To
prevent any restart attempts after the limit is reached, start the
locator with the new command line argument --lockout. In this case
all attempts to restart are prevented until the tao_imr update
command is used to reset the start counter.
In addtion, this commit includes unused member removal and related
cleanup.
* bin/tao_other_tests.lst:
* orbsvcs/tests/ImplRepo/RestartServer/run_test.pl:
Extended the test case to add lockout checking.
Diffstat (limited to 'TAO/bin')
| -rw-r--r-- | TAO/bin/tao_orb_tests.lst | 3 | ||||
| -rw-r--r-- | TAO/bin/tao_other_tests.lst | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst index 5bb65a0be48..ffd227f9012 100644 --- a/TAO/bin/tao_orb_tests.lst +++ b/TAO/bin/tao_orb_tests.lst @@ -380,7 +380,7 @@ TAO/tests/AMI_Buffering/run_timeout.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/AMI_Buffering/run_timeout_reactive.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/Big_AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Big_Oneways/run_test.pl: !ST -TAO/tests/Big_Twoways/run_test.pl: !ST +TAO/tests/Big_Twoways/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Big_Reply/run_test.pl: !ST TAO/tests/Big_Request_Muxing/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Oneways_Invoking_Twoways/run_test.pl: !ST @@ -502,4 +502,3 @@ TAO/DevGuideExamples/ValueTypes/Messenger/run_test.pl: !MINIMUM !CORBA_E_MICRO TAO/DevGuideExamples/ValueTypes/Bank/run_test.pl: !MINIMUM !CORBA_E_MICRO TAO/DevGuideExamples/AMH/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO TAO/DevGuideExamples/AMH_AMI/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO - diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index f01ced68c5e..a112b745eef 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -148,6 +148,7 @@ TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardonce: !MINIMUM !C TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -pingexternal: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS +TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual -lockout: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -delay 20 -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS |