You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by we...@apache.org on 2025/03/24 23:32:47 UTC
(ozone) 03/03: HDDS-12668. HSync upgrade test failure (#8137)
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch ozone-2.0
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit b5723a0f7aee595c8d2773ced176b76691d1dd93
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Tue Mar 25 00:30:06 2025 +0100
HDDS-12668. HSync upgrade test failure (#8137)
(cherry picked from commit de5c0a385ed873425ae94245d8b5b28040ab99ef)
---
hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-config | 2 ++
.../upgrade/upgrades/non-rolling-upgrade/callbacks/1.5.0/callback.sh | 2 +-
hadoop-ozone/dist/src/main/smoketest/hsync/upgrade-hsync-check.robot | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
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 e19062a725..10426b8610 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,7 +38,9 @@ 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
+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
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/1.5.0/callback.sh
index ec64d5dcd5..6cf3593bf8 100644
--- 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/1.5.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
}
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 1250ad1344..7e593cf7ab 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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org