From 7e9eed7b9070c703d11d1df0dc3d585713e14ec5 Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Tue, 5 Nov 2024 16:04:34 -0800 Subject: [PATCH] Added compatibity test for HSync --- .../dist/src/main/smoketest/compatibility/read.robot | 5 +++++ .../dist/src/main/smoketest/compatibility/setup.robot | 1 + .../dist/src/main/smoketest/compatibility/write.robot | 10 ++++++++++ 3 files changed, 16 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..f8f4bf00299b 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/read.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/read.robot @@ -46,3 +46,8 @@ 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 '${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=o3fs://bucket1.vol1/dir-${SUFFIX}/file-${SUFFIX} 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..3b90a4e007f9 100644 --- a/hadoop-ozone/dist/src/main/smoketest/compatibility/write.robot +++ b/hadoop-ozone/dist/src/main/smoketest/compatibility/write.robot @@ -17,6 +17,8 @@ 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 @@ -40,3 +42,11 @@ 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 + ${o3fspath} = Format FS URL o3fs vol1 bucket1 + Freon DFSG sync=HSYNC path=${o3fspath} + ${pfspath} = Format FS URL ofs vol1 bucket1 + Freon DFSG sync=HSYNC path=${pfspath}