From a3676da9c38c2f114c4ea5770a5472ce6de31e1f Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 5 Mar 2025 11:00:45 +0100 Subject: [PATCH 1/3] HDDS-12358. Intermittent failure in Test om compatibility --- hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot | 3 ++- hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot | 3 ++- .../dist/src/main/smoketest/compatibility/recon.robot | 3 ++- hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot | 3 ++- hadoop-ozone/dist/src/main/smoketest/lib/os.robot | 5 +++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot index c0ec12335fb1..d159e050aaa6 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot @@ -22,6 +22,7 @@ Test Timeout 5 minutes *** Test Cases *** Picks up command line options Pass Execution If '%{HDDS_DN_OPTS}' == '' Command-line option required for process check - ${processes} = List All Processes + ${processes} = List Processes proc_datanode + Pass Execution If '${processes}' == '' Process not found Should Contain ${processes} %{HDDS_DN_OPTS} Should Contain ${processes} %{HADOOP_OPTS} diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot index c3caec2ae917..a177d91c08e6 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot @@ -22,7 +22,8 @@ Test Timeout 5 minutes *** Test Cases *** Picks up command line options Pass Execution If '%{HDFS_OM_OPTS}' == '' Command-line option required for process check - ${processes} = List All Processes + ${processes} = List Processes proc_om + Pass Execution If '${processes}' == '' Process not found Should Contain ${processes} %{HDFS_OM_OPTS} Should Contain ${processes} %{HADOOP_OPTS} diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot index 150e84dc04d8..478db1193a46 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot @@ -22,5 +22,6 @@ Test Timeout 5 minutes *** Test Cases *** Picks up command line options Pass Execution If '%{HADOOP_OPTS}' == '' Command-line option required for process check - ${processes} = List All Processes + ${processes} = List Processes proc_recon + Pass Execution If '${processes}' == '' Process not found Should Contain ${processes} %{HADOOP_OPTS} diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot index 27546f66aa9e..c8d89e525dcd 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot @@ -22,6 +22,7 @@ Test Timeout 5 minutes *** Test Cases *** Picks up command line options Pass Execution If '%{HDFS_STORAGECONTAINERMANAGER_OPTS}' == '' Command-line option required for process check - ${processes} = List All Processes + ${processes} = List Processes proc_scm + Pass Execution If '${processes}' == '' Process not found Should Contain ${processes} %{HDFS_STORAGECONTAINERMANAGER_OPTS} Should Contain ${processes} %{HADOOP_OPTS} diff --git a/hadoop-ozone/dist/src/main/smoketest/lib/os.robot b/hadoop-ozone/dist/src/main/smoketest/lib/os.robot index 98f836ff8bf7..b51cc7da0ffa 100644 --- a/hadoop-ozone/dist/src/main/smoketest/lib/os.robot +++ b/hadoop-ozone/dist/src/main/smoketest/lib/os.robot @@ -63,6 +63,7 @@ Get Random Filename File Should Not Exist ${tmpfile} [return] ${tmpfile} -List All Processes - ${output} = Execute ps aux +List Processes + [arguments] ${pattern}=${EMPTY} + ${output} = Execute and ignore error ps aux | grep '${pattern}' | grep -v grep [return] ${output} From d822d780a5865da40dae2107e1805276e7a90c2b Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 19 Mar 2025 08:31:52 +0100 Subject: [PATCH 2/3] Revert "HDDS-12358. Intermittent failure in Test om compatibility" This reverts commit a3676da9c38c2f114c4ea5770a5472ce6de31e1f. --- hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot | 3 +-- hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot | 3 +-- .../dist/src/main/smoketest/compatibility/recon.robot | 3 +-- hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot | 3 +-- hadoop-ozone/dist/src/main/smoketest/lib/os.robot | 5 ++--- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot index d159e050aaa6..c0ec12335fb1 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/dn.robot @@ -22,7 +22,6 @@ Test Timeout 5 minutes *** Test Cases *** Picks up command line options Pass Execution If '%{HDDS_DN_OPTS}' == '' Command-line option required for process check - ${processes} = List Processes proc_datanode - Pass Execution If '${processes}' == '' Process not found + ${processes} = List All Processes Should Contain ${processes} %{HDDS_DN_OPTS} Should Contain ${processes} %{HADOOP_OPTS} diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot index a177d91c08e6..c3caec2ae917 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot @@ -22,8 +22,7 @@ Test Timeout 5 minutes *** Test Cases *** Picks up command line options Pass Execution If '%{HDFS_OM_OPTS}' == '' Command-line option required for process check - ${processes} = List Processes proc_om - Pass Execution If '${processes}' == '' Process not found + ${processes} = List All Processes Should Contain ${processes} %{HDFS_OM_OPTS} Should Contain ${processes} %{HADOOP_OPTS} diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot index 478db1193a46..150e84dc04d8 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot @@ -22,6 +22,5 @@ Test Timeout 5 minutes *** Test Cases *** Picks up command line options Pass Execution If '%{HADOOP_OPTS}' == '' Command-line option required for process check - ${processes} = List Processes proc_recon - Pass Execution If '${processes}' == '' Process not found + ${processes} = List All Processes Should Contain ${processes} %{HADOOP_OPTS} diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot index c8d89e525dcd..27546f66aa9e 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/scm.robot @@ -22,7 +22,6 @@ Test Timeout 5 minutes *** Test Cases *** Picks up command line options Pass Execution If '%{HDFS_STORAGECONTAINERMANAGER_OPTS}' == '' Command-line option required for process check - ${processes} = List Processes proc_scm - Pass Execution If '${processes}' == '' Process not found + ${processes} = List All Processes Should Contain ${processes} %{HDFS_STORAGECONTAINERMANAGER_OPTS} Should Contain ${processes} %{HADOOP_OPTS} diff --git a/hadoop-ozone/dist/src/main/smoketest/lib/os.robot b/hadoop-ozone/dist/src/main/smoketest/lib/os.robot index b51cc7da0ffa..98f836ff8bf7 100644 --- a/hadoop-ozone/dist/src/main/smoketest/lib/os.robot +++ b/hadoop-ozone/dist/src/main/smoketest/lib/os.robot @@ -63,7 +63,6 @@ Get Random Filename File Should Not Exist ${tmpfile} [return] ${tmpfile} -List Processes - [arguments] ${pattern}=${EMPTY} - ${output} = Execute and ignore error ps aux | grep '${pattern}' | grep -v grep +List All Processes + ${output} = Execute ps aux [return] ${output} From 9ec3083e8dbc541903b7209e8ed65444fed44015 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 19 Mar 2025 08:40:23 +0100 Subject: [PATCH 3/3] HDDS-12358. Intermittent failure in Test om compatibility --- .../dist/src/main/smoketest/compatibility/om.robot | 10 +++++++--- .../dist/src/main/smoketest/compatibility/recon.robot | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot index c3caec2ae917..6b27946e0722 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/om.robot @@ -19,13 +19,17 @@ Library BuiltIn Resource ../lib/os.robot Test Timeout 5 minutes -*** Test Cases *** -Picks up command line options - Pass Execution If '%{HDFS_OM_OPTS}' == '' Command-line option required for process check +*** Keywords *** +Check command-line options ${processes} = List All Processes Should Contain ${processes} %{HDFS_OM_OPTS} Should Contain ${processes} %{HADOOP_OPTS} +*** Test Cases *** +Picks up command line options + Pass Execution If '%{HDFS_OM_OPTS}' == '' Command-line option required for process check + Wait Until Keyword Succeeds 3min 2sec Check command-line options + Rejects Atomic Key Rewrite Execute ozone freon ockg -n1 -t1 -p rewrite ${output} = Execute and check rc ozone sh key rewrite -t EC -r rs-3-2-1024k /vol1/bucket1/rewrite/0 255 diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot index 150e84dc04d8..79f7a3518aff 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/recon.robot @@ -19,8 +19,12 @@ Library BuiltIn Resource ../lib/os.robot Test Timeout 5 minutes +*** Keywords *** +Check command-line options + ${processes} = List All Processes + Should Contain ${processes} %{HADOOP_OPTS} + *** Test Cases *** Picks up command line options Pass Execution If '%{HADOOP_OPTS}' == '' Command-line option required for process check - ${processes} = List All Processes - Should Contain ${processes} %{HADOOP_OPTS} + Wait Until Keyword Succeeds 3min 2sec Check command-line options