From a97ef7bc05eb0e46021680bdb4d98c2fd25f171e Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Sat, 22 Mar 2025 09:35:19 +0800 Subject: [PATCH 1/5] HDDS-12662. Rename upgrade callback directory from 1.5.0 to 2.0.0 (cherry picked from commit d793de94844e40fe12753a73267da68c3e58f3c5) --- .../non-rolling-upgrade/callbacks/{1.5.0 => 2.0.0}/callback.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hadoop-ozone/dist/src/main/compose/upgrade/upgrades/non-rolling-upgrade/callbacks/{1.5.0 => 2.0.0}/callback.sh (100%) diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/upgrades/non-rolling-upgrade/callbacks/1.5.0/callback.sh b/hadoop-ozone/dist/src/main/compose/upgrade/upgrades/non-rolling-upgrade/callbacks/2.0.0/callback.sh similarity index 100% rename from hadoop-ozone/dist/src/main/compose/upgrade/upgrades/non-rolling-upgrade/callbacks/1.5.0/callback.sh rename to hadoop-ozone/dist/src/main/compose/upgrade/upgrades/non-rolling-upgrade/callbacks/2.0.0/callback.sh From 58c183d2a8dd82195e0a18d16931a5dc87a8971b Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sat, 22 Mar 2025 10:02:04 +0100 Subject: [PATCH 2/5] HDDS-12029. (addendum) Move ozone debug recover to ozone admin om lease recover --- .../dist/src/main/smoketest/hsync/upgrade-hsync-check.robot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-ozone/dist/src/main/smoketest/hsync/upgrade-hsync-check.robot b/hadoop-ozone/dist/src/main/smoketest/hsync/upgrade-hsync-check.robot index 1250ad1344e5..7e593cf7abb3 100644 --- a/hadoop-ozone/dist/src/main/smoketest/hsync/upgrade-hsync-check.robot +++ b/hadoop-ozone/dist/src/main/smoketest/hsync/upgrade-hsync-check.robot @@ -45,10 +45,10 @@ Freon DFSG Test HSync lease recover prior to finalization Create volume bucket and put key ${o3fs_path} = Format FS URL o3fs ${VOLUME} ${BUCKET} ${KEY} - ${result} = Execute and checkrc ozone debug recover --path=${o3fs_path} 255 + ${result} = Execute and checkrc ozone admin om lease recover --path=${o3fs_path} 255 Should contain ${result} It belongs to the layout feature HBASE_SUPPORT, whose layout version is 7 ${ofs_path} = Format FS URL ofs ${VOLUME} ${BUCKET} ${KEY} - ${result} = Execute and checkrc ozone debug recover --path=${ofs_path} 255 + ${result} = Execute and checkrc ozone admin om lease recover --path=${ofs_path} 255 Should contain ${result} It belongs to the layout feature HBASE_SUPPORT, whose layout version is 7 Generate key for o3fs by HSYNC prior to finalization From 6a728e0534c3a464f3598f520a010540b5ee9f0b Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sat, 22 Mar 2025 12:56:18 +0100 Subject: [PATCH 3/5] enable ozone.client.hbase.enhancements.allowed --- .../dist/src/main/compose/upgrade/compose/ha/docker-config | 1 + 1 file changed, 1 insertion(+) diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config index e19062a7259a..f4c1dd81d56f 100644 --- a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config +++ b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config @@ -38,6 +38,7 @@ OZONE-SITE.XML_ozone.scm.container.size=1GB OZONE-SITE.XML_hdds.datanode.dir=/data/hdds OZONE-SITE.XML_hdds.datanode.volume.min.free.space=100MB OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http +OZONE-SITE.XML_ozone.client.hbase.enhancements.allowed=true OZONE-SITE.XML_ozone.fs.hsync.enabled=true # If SCM sends container close commands as part of upgrade finalization while From 6d5d6b9f3b61ca36617ac66c522610845a54274b Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sat, 22 Mar 2025 13:02:44 +0100 Subject: [PATCH 4/5] HDDS-12029. (addendum) Move ozone debug recover to ozone admin om lease recover --- .../upgrades/non-rolling-upgrade/callbacks/2.0.0/callback.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/upgrades/non-rolling-upgrade/callbacks/2.0.0/callback.sh b/hadoop-ozone/dist/src/main/compose/upgrade/upgrades/non-rolling-upgrade/callbacks/2.0.0/callback.sh index ec64d5dcd541..6cf3593bf863 100644 --- a/hadoop-ozone/dist/src/main/compose/upgrade/upgrades/non-rolling-upgrade/callbacks/2.0.0/callback.sh +++ b/hadoop-ozone/dist/src/main/compose/upgrade/upgrades/non-rolling-upgrade/callbacks/2.0.0/callback.sh @@ -26,6 +26,6 @@ with_this_version_pre_finalized() { with_this_version_finalized() { execute_robot_test "$SCM" -N "${OUTPUT_NAME}-check-finalization" --include finalized upgrade/check-finalization.robot - execute_robot_test "$SCM" -N "${OUTPUT_NAME}-hsync" debug/ozone-debug-lease-recovery.robot + execute_robot_test "$SCM" -N "${OUTPUT_NAME}-hsync" admincli/lease-recovery.robot execute_robot_test "$SCM" -N "${OUTPUT_NAME}-freon-hsync" freon/hsync.robot } From 93035d044416004448bc036189c0bb4b2e760d8b Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sat, 22 Mar 2025 13:03:34 +0100 Subject: [PATCH 5/5] enable ozone.hbase.enhancements.allowed --- .../dist/src/main/compose/upgrade/compose/ha/docker-config | 1 + 1 file changed, 1 insertion(+) diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config index f4c1dd81d56f..10426b8610bb 100644 --- a/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config +++ b/hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config @@ -40,6 +40,7 @@ OZONE-SITE.XML_hdds.datanode.volume.min.free.space=100MB OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http OZONE-SITE.XML_ozone.client.hbase.enhancements.allowed=true OZONE-SITE.XML_ozone.fs.hsync.enabled=true +OZONE-SITE.XML_ozone.hbase.enhancements.allowed=true # If SCM sends container close commands as part of upgrade finalization while # datanodes are doing a leader election, all 3 replicas may end up in the