Check cluster status after rejoin 58/68058/2
authorTomas Jamrisko <tjamrisk@redhat.com>
Thu, 8 Feb 2018 10:26:18 +0000 (11:26 +0100)
committerJamo Luhrsen <jluhrsen@redhat.com>
Fri, 9 Feb 2018 22:08:49 +0000 (22:08 +0000)
We want to check the cluster is in sync after rejoining. Same
as the other recovery functions

Change-Id: If4d4309dc71130a3d50b50f4f7d21aa5e63c25f4
Signed-off-by: Tomas Jamrisko <tjamrisk@redhat.com>
csit/libraries/ClusterManagement.robot

index 72e4503090408308311d4485ea751c386ae6e5d3..0278e204919ca7810d0ff3a27867438f778df562 100644 (file)
@@ -512,7 +512,7 @@ Isolate_Member_From_List_Or_All
     [Return]    ${updated_index_list}
 
 Rejoin_Member_From_List_Or_All
-    [Arguments]    ${rejoin_member_index}    ${member_index_list}=${EMPTY}    ${protocol}=all    ${port}=${EMPTY}
+    [Arguments]    ${rejoin_member_index}    ${member_index_list}=${EMPTY}    ${protocol}=all    ${port}=${EMPTY}    ${timeout}=60s
     [Documentation]    If the list is empty, rejoin member from all ODL instances. Otherwise, rejoin member based on present indices.
     ${index_list} =    List_Indices_Or_All    given_list=${member_index_list}
     ${source} =    Collections.Get_From_Dictionary    ${ClusterManagement__index_to_ip_mapping}    ${rejoin_member_index}
@@ -524,6 +524,7 @@ Rejoin_Member_From_List_Or_All
     ${command} =    BuiltIn.Set_Variable    sudo /sbin/iptables -L -n
     ${output} =    Run_Bash_Command_On_Member    command=${command}    member_index=${rejoin_member_index}
     BuiltIn.Log    ${output}
+    BuiltIn.Wait_Until_Keyword_Succeeds    ${timeout}    10s    Check_Cluster_Is_In_Sync
 
 Flush_Iptables_From_List_Or_All
     [Arguments]    ${member_index_list}=${EMPTY}