Fix ENSA2 failing on 12sp5 during failover

TEAM-9261 - [ENSA2]Investigate ENSA2 failing on 12sp5 during failover
lilyeyes · Jun 5, 2024 · b7c3f45 · b7c3f45
1 parent b4f7333
commit b7c3f45
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/lib/hacluster.pm b/lib/hacluster.pm
@@ -1394,7 +1394,7 @@ B<timeout> Override default timeout value
 sub crm_check_resource_location {
     my (%args) = @_;
     my $wait_for_target = $args{wait_for_target} // 0;
-    my $timeout = $args{timeout} // bmwqemu::scale_timeout(120);
+    my $timeout = $args{timeout} // bmwqemu::scale_timeout(200);
     my $cmd = join(' ', "crm resource status", $args{resource}, "| grep 'resource $args{resource} is'"); # Grep to avoid random kernel message appearing in script_output
     my $out;
     my $current_location;

diff --git a/tests/sles4sap/ensa/netweaver_ensa2_cluster.pm b/tests/sles4sap/ensa/netweaver_ensa2_cluster.pm
@@ -59,6 +59,9 @@ sub run {
     wait_until_resources_started();
     $self->sap_show_status_info(cluster => 1, netweaver => 1,
         instance_id => $install_data->{instances}{$instance_type}{instance_id});
+    record_info("wait 60s");
+    $self->sap_show_status_info(cluster => 1, netweaver => 1,
+        instance_id => $install_data->{instances}{$instance_type}{instance_id});
 }
 
 1;
diff --git a/tests/sles4sap/ensa/netweaver_ensa2_cluster_connector.pm b/tests/sles4sap/ensa/netweaver_ensa2_cluster_connector.pm
@@ -62,11 +62,13 @@ sub run {
 
     assert_script_run("crm configure property maintenance-mode='false'");
     crm_wait_for_maintenance(target_state => 'false');
-
     # Ensure resource groups are started in correct place (physical hostname)
     crm_check_resource_location(resource => "grp_$sap_sid\_$instance_type$instance_id", wait_for_target => $physical_hostname);
     $self->sap_show_status_info(cluster => 1, netweaver => 1,
         instance_id => $instance_id);
+    record_info("wait 60s");
+    $self->sap_show_status_info(cluster => 1, netweaver => 1,
+        instance_id => $instance_id);
 }
 
 1;
diff --git a/tests/sles4sap/ensa/netweaver_ensa2_web_methods.pm b/tests/sles4sap/ensa/netweaver_ensa2_web_methods.pm
@@ -46,6 +46,7 @@ sub run {
     $self->webmethod_checks($instance_id);
     # Execute failover from ASCS instance
     if ($instance_type eq 'ASCS') {
+        sleep 90;
         record_info('Failover', "Executing 'HAFailoverToNode'. Failover from $physical_hostname to remote site");
         $self->sapcontrol(webmethod => 'HAFailoverToNode', instance_id => $instance_id, additional_args => "\"\"");
     }
@@ -61,6 +62,7 @@ sub run {
     $self->webmethod_checks($instance_id);
     # Execute failover from ASCS instance - this will return resources to original host
     if ($instance_type eq 'ASCS') {
+        sleep 90;
         record_info('Failover', "Executing 'HAFailoverToNode'. Failover from $physical_hostname to remote site");
         $self->sapcontrol(webmethod => 'HAFailoverToNode', instance_id => $instance_id, additional_args => "\"\"");
     }