From 070e322be319ff394b34e893211184305c8d8b89 Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Tue, 5 Nov 2024 16:04:34 -0800 Subject: [PATCH 1/2] HDDS-11311. Added compatibility test for HSync --- .../src/main/smoketest/compatibility/read.robot | 6 ++++++ .../src/main/smoketest/compatibility/setup.robot | 1 + .../src/main/smoketest/compatibility/write.robot | 14 ++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/read.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/read.robot index e56465bb8bc8..d4c9088fe8fa 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/read.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/read.robot @@ -46,3 +46,9 @@ FSO Bucket Can Be Read Execute ozone fs -get ofs://om/vol1/fso-bucket-${SUFFIX}/dir/subdir/file ${TEMP_DIR}/ Execute diff -q ${TESTFILE} ${TEMP_DIR}/file [teardown] Execute rm -f ${TEMP_DIR}/file + +HSync Lease Recover Can Be Used + Pass Execution If '${DATA_VERSION}' < '${HSYNC_VERSION}' Skipped the test case + Pass Execution If '${CLIENT_VERSION}' < '${HSYNC_VERSION}' Client does not support HSYNC + Pass Execution If '${CLUSTER_VERSION}' < '${HSYNC_VERSION}' Cluster does not support HSYNC + Execute ozone debug recover --path=ofs://om/vol1/fso-bucket-${SUFFIX}/dir/subdir/file diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/setup.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/setup.robot index 5620d00025db..b68ab23ef99f 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/setup.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/setup.robot @@ -21,6 +21,7 @@ Resource ../ozone-lib/shell.robot *** Variables *** ${SUFFIX} ${EMPTY} ${FSO_VERSION} 1.3.0 +${HSYNC_VERSION} 1.5.0 *** Keywords *** diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/write.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/write.robot index a44901a99acd..4bcb490f372d 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/write.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/write.robot @@ -17,11 +17,15 @@ Documentation Write Compatibility Resource ../ozone-lib/shell.robot Resource setup.robot +Resource ../lib/fs.robot +Resource ../ozone-lib/freon.robot Test Timeout 5 minutes Suite Setup Create Local Test File *** Variables *** ${SUFFIX} ${EMPTY} +${VOL} comp-hsync-volume +${BUCK} comp-hsync-bucket *** Test Cases *** @@ -40,3 +44,13 @@ FSO Bucket Can Be Created and Used Execute ozone sh bucket create --layout FILE_SYSTEM_OPTIMIZED /vol1/fso-bucket-${SUFFIX} Execute ozone fs -mkdir -p ofs://om/vol1/fso-bucket-${SUFFIX}/dir/subdir Execute ozone fs -put ${TESTFILE} ofs://om/vol1/fso-bucket-${SUFFIX}/dir/subdir/file + +HSync Can Be Used To Create Keys + Pass Execution If '${CLIENT_VERSION}' < '${HSYNC_VERSION}' Client does not support HSYNC + Pass Execution If '${CLUSTER_VERSION}' < '${HSYNC_VERSION}' Cluster does not support HSYNC + Execute ozone sh volume create /${VOL} + Execute ozone sh bucket create /${VOL}/${BUCK} + ${o3fspath} = Format FS URL o3fs ${VOL} ${BUCK} + Freon DFSG sync=HSYNC path=${o3fspath} + ${pfspath} = Format FS URL ofs ${VOL} ${BUCK} + Freon DFSG sync=HSYNC path=${pfspath} From 447ad58dce101ca3b68ea07f977153cebd67ae8b Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Wed, 6 Nov 2024 18:24:10 -0800 Subject: [PATCH 2/2] Changed HSync base version to 2.0.0 in test setup --- hadoop-ozone/dist/src/main/smoketest/compatibility/setup.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/smoketest/compatibility/setup.robot b/hadoop-ozone/dist/src/main/smoketest/compatibility/setup.robot index b68ab23ef99f..575c715a57e1 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/setup.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/setup.robot @@ -21,7 +21,7 @@ Resource ../ozone-lib/shell.robot *** Variables *** ${SUFFIX} ${EMPTY} ${FSO_VERSION} 1.3.0 -${HSYNC_VERSION} 1.5.0 +${HSYNC_VERSION} 2.0.0 *** Keywords ***