From a3089df4a6eebd709506cf36811ae5f75f63a7c7 Mon Sep 17 00:00:00 2001 From: Peter Gubka Date: Tue, 2 May 2017 16:33:33 +0200 Subject: [PATCH] Fix suites based on bug 8207 There is a time for akka to remove the node from the cluster. This time is usually longer than the time when remaining/unisolated nodes elect a new owner. The node which was and is follower still keeps a reference to the isolated node until akka notification. Wait is needed, WUSK were added to wait longer for cluster to work as expected. Change-Id: Ifda89ca6e4370282ef98c11ec5a837485c72279b Signed-off-by: Peter Gubka --- csit/libraries/controller/CsCommon.robot | 2 +- .../suites/controller/singleton_service/global_rpc_freeze.robot | 2 +- .../controller/singleton_service/global_rpc_isolate.robot | 2 +- csit/suites/controller/singleton_service/global_rpc_kill.robot | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csit/libraries/controller/CsCommon.robot b/csit/libraries/controller/CsCommon.robot index 994ff5af62..6bed51a8a0 100644 --- a/csit/libraries/controller/CsCommon.robot +++ b/csit/libraries/controller/CsCommon.robot @@ -112,7 +112,7 @@ Isolate_Owner_And_Verify_Isolated BuiltIn.Wait_Until_Keyword_Succeeds 5x 2s ClusterManagement.Check_New_Owner_Got_Elected_For_Device ${CS_DEVICE_NAME} ${CS_DEVICE_TYPE} ${cs_isolated_index} ... ${node_to_ask} Get_And_Save_Present_CsOwner_And_CsCandidates ${node_to_ask} - BuiltIn.Wait_Until_Keyword_Succeeds 5x 2s MdsalLowlevel.Get_Singleton_Constant ${cs_isolated_index} explicit_status_codes=${CS_STATUS_ISOLATED} + BuiltIn.Wait_Until_Keyword_Succeeds 60s 3s MdsalLowlevel.Get_Singleton_Constant ${cs_isolated_index} explicit_status_codes=${CS_STATUS_ISOLATED} Rejoin_Node_And_Verify_Rejoined [Documentation] Rejoin isolated node. diff --git a/csit/suites/controller/singleton_service/global_rpc_freeze.robot b/csit/suites/controller/singleton_service/global_rpc_freeze.robot index 67dd639cf1..24d78f132e 100644 --- a/csit/suites/controller/singleton_service/global_rpc_freeze.robot +++ b/csit/suites/controller/singleton_service/global_rpc_freeze.robot @@ -60,7 +60,7 @@ Verify_New_Basic_Rpc_Test_Owner_Elected Rpc_On_Remained_Cluster_Nodes [Documentation] Run rpc on remained cluster nodes. : FOR ${idx} IN @{old_brt_successors} - \ Run_Rpc ${idx} + \ BuiltIn.Wait_Until_Keyword_Succeeds 60s 3s Run_Rpc ${idx} Unfreeze_Frozen_Member [Documentation] Restart frozen node diff --git a/csit/suites/controller/singleton_service/global_rpc_isolate.robot b/csit/suites/controller/singleton_service/global_rpc_isolate.robot index 01de5e30a6..1ff2ccfb94 100644 --- a/csit/suites/controller/singleton_service/global_rpc_isolate.robot +++ b/csit/suites/controller/singleton_service/global_rpc_isolate.robot @@ -66,7 +66,7 @@ Rpc_On_Isolated_Node Rpc_On_Non_Isolated_Cluster_Nodes [Documentation] Run rpc on remained cluster nodes. : FOR ${idx} IN @{old_brt_successors} - \ Run_Rpc ${idx} + \ BuiltIn.Wait_Until_Keyword_Succeeds 60s 3s Run_Rpc ${idx} Rejoin_Isolated_Member [Documentation] Rejoin isolated node diff --git a/csit/suites/controller/singleton_service/global_rpc_kill.robot b/csit/suites/controller/singleton_service/global_rpc_kill.robot index 40a1934b21..2cbcc42ca2 100644 --- a/csit/suites/controller/singleton_service/global_rpc_kill.robot +++ b/csit/suites/controller/singleton_service/global_rpc_kill.robot @@ -58,7 +58,7 @@ Verify_New_Basic_Rpc_Test_Owner_Elected Rpc_On_Remained_Cluster_Nodes [Documentation] Run rpc on remained cluster nodes. : FOR ${idx} IN @{old_brt_successors} - \ Run_Rpc ${idx} + \ BuiltIn.Wait_Until_Keyword_Succeeds 60s 3s Run_Rpc ${idx} Restart_Killed_Member [Documentation] Restart killed node -- 2.36.6