Skip to content

Commit eaa60a5

Browse files
committed
Refactor test case descriptions and enable/disable flags for kill server processes in input-api.yaml; update test case messages in kill-message-server.yml and kill-enqueue-server.yml to include ENSA architecture handling.
1 parent 4840d86 commit eaa60a5

4 files changed

Lines changed: 8 additions & 29 deletions

File tree

src/roles/ha_scs/tasks/kill-enqueue-replication.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,6 @@
6262
ansible.builtin.pause:
6363
seconds: 60
6464

65-
- name: "Test Execution: Validate ERS Process"
66-
when: ansible_hostname == cluster_status_pre.ers_node
67-
become: true
68-
block:
69-
- name: "Test Execution: Check if ERS Process Restarted (ENSA1)"
70-
ansible.builtin.shell: pgrep -f "er.sap{{ sap_sid | upper }}" | wc -l
71-
register: check_er_restarted
72-
failed_when: check_er_restarted.stdout == "0"
73-
when: ensa2_check.stdout == "0"
74-
retries: 10
75-
delay: 5
76-
until: check_er_restarted.stdout != "0"
77-
78-
- name: "Test Execution: Check if ERS Process Restarted (ENSA2)"
79-
ansible.builtin.shell: pgrep -f "enqr.sap{{ sap_sid | upper }}" | wc -l
80-
register: check_enqr_restarted
81-
failed_when: check_enqr_restarted.stdout == "0"
82-
when: ensa2_check.stdout != "0"
83-
retries: 10
84-
delay: 5
85-
until: check_enqr_restarted.stdout != "0"
86-
8765
- name: "Test Execution: Validate SCS cluster status"
8866
get_cluster_status_scs:
8967
sap_sid: "{{ sap_sid | lower }}"
@@ -113,15 +91,12 @@
11391
ENSA Version: {{ "ENSA1" if ensa2_check.stdout == "0" else "ENSA2" }}
11492
ASCS Node: {{ cluster_status_pre.ascs_node }}
11593
ERS Node: {{ cluster_status_pre.ers_node }}
116-
ERS Process Restarted: {{ "Yes" if (ensa2_check.stdout == "0" and check_er_restarted.stdout != "0") or (ensa2_check.stdout != "0" and check_enqr_restarted.stdout != "0") else "No" }}
11794
test_case_details_from_test_case: {
11895
"Pre Validations: Validate SCS cluster status": "{{ cluster_status_pre }}",
11996
"Pre Validations: CleanUp any failed resource": "{{ cleanup_failed_resource_pre }}",
12097
"Test Execution: ENSA Version Check": "{{ ensa2_check }}",
12198
"Test Execution: Kill Enqueue Replication Server Process (ENSA1)": "{{ kill_er_result | default(omit) }}",
12299
"Test Execution: Kill Enqueue Replication Server Process (ENSA2)": "{{ kill_enqr_result | default(omit) }}",
123-
"Test Execution: Verify ERS Process Restarted (ENSA1)": "{{ check_er_restarted | default(omit) }}",
124-
"Test Execution: Verify ERS Process Restarted (ENSA2)": "{{ check_enqr_restarted | default(omit) }}",
125100
"Test Execution: Cleanup resources": "{{ cleanup_failed_resource_test_execution }}",
126101
"Post Validations Result": "{{ cluster_status_test_execution }}",
127102
}

src/roles/ha_scs/tasks/kill-enqueue-server.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
- name: "Set test case message and details"
9797
ansible.builtin.set_fact:
9898
test_case_message_from_test_case: |
99+
ENSA Version: {{ "ENSA1" if ensa2_check.stdout == "0" else "ENSA2" }}
99100
Old ASCS: {{ cluster_status_pre.ascs_node }}
100101
New ASCS: {{ cluster_status_test_execution.ascs_node }}
101102
Old ERS: {{ cluster_status_pre.ers_node }}

src/roles/ha_scs/tasks/kill-message-server.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
- name: "Set test case message and details"
9393
ansible.builtin.set_fact:
9494
test_case_message_from_test_case: |
95+
ENSA Version: {{ "ENSA1" if ensa2_check.stdout == "0" else "ENSA2" }}
9596
Old ASCS: {{ cluster_status_pre.ascs_node }}
9697
New ASCS: {{ cluster_status_test_execution.ascs_node }}
9798
Old ERS: {{ cluster_status_pre.ers_node }}

src/vars/input-api.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,18 @@ test_groups:
174174
task_name: kill-message-server
175175
description: |
176176
The Message Server Process Kill test simulates failure of the message server process on the
177-
ASCS node by forcefully terminating it using the kill -9 signal. It verifies proper cluster
177+
ASCS node by forcefully terminating it using the kill -9 signal. This test
178+
handles both ENSA1 and ENSA2 architectures. It verifies proper cluster
178179
reaction, automatic failover to the ERS node, and ensures service continuity after
179180
the process failure.
180-
enabled: true
181+
enabled: false
181182

182183
- name: "Kill Enqueue Server Process"
183184
task_name: kill-enqueue-server
184185
description: |
185186
The Enqueue Server Process Kill test simulates failure of the enqueue server process on the
186-
ASCS node by forcefully terminating it using the kill -9 signal. It validates proper
187+
ASCS node by forcefully terminating it using the kill -9 signal. This test
188+
handles both ENSA1 and ENSA2 architectures. It validates proper
187189
cluster behavior, automatic failover execution, and confirms that the enqueue table is
188190
properly replicated to preserve the lock state.
189191
enabled: false
@@ -195,7 +197,7 @@ test_groups:
195197
process on the ERS node by forcefully terminating it using the kill -9 signal. This test
196198
handles both ENSA1 and ENSA2 architectures. It validates the automatic restart of the
197199
process and ensures continued replication of the enqueue table.
198-
enabled: false
200+
enabled: true
199201

200202
- name: "Kill sapstartsrv Process for ASCS"
201203
task_name: kill-sapstartsrv-process

0 commit comments

Comments
 (0)