From 9baed029c43060eac4d6ea553a3798c0edc41ab2 Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Tue, 3 Sep 2024 11:13:58 -0700 Subject: [PATCH] HDDS-11407. Use OMLayoutFeature.HBASE_SUPPORT for HSYNC --- .../apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java | 2 +- .../org/apache/hadoop/ozone/om/upgrade/OMLayoutFeature.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java index b8bf89a35427..49323bf532df 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java @@ -553,7 +553,7 @@ public static OMRequest blockCommitKeyWithBucketLayoutFromOldClient( public static OMRequest disallowHsync( OMRequest req, ValidationContext ctx) throws OMException { if (!ctx.versionManager() - .isAllowed(OMLayoutFeature.HSYNC)) { + .isAllowed(OMLayoutFeature.HBASE_SUPPORT)) { CommitKeyRequest commitKeyRequest = req.getCommitKeyRequest(); boolean isHSync = commitKeyRequest.hasHsync() && commitKeyRequest.getHsync(); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutFeature.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutFeature.java index 7cdff8f5c11f..5a62a7cfc626 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutFeature.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutFeature.java @@ -40,6 +40,7 @@ public enum OMLayoutFeature implements LayoutFeature { MULTITENANCY_SCHEMA(3, "Multi-Tenancy Schema"), + @Deprecated HSYNC(4, "Support hsync"), FILESYSTEM_SNAPSHOT(5, "Ozone version supporting snapshot"),