(ozone) 04/12: Improve setSafeMode handling in OzoneManager.

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

smengcl pushed a commit to branch ozone-2.1
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit 654b859bd16cb943b0f91fdddd8935214142f0da
Author: Siyao Meng <50...@users.noreply.github.com>
AuthorDate: Wed Oct 14 01:38:20 2026 -0700

    Improve setSafeMode handling in OzoneManager.
    
    (cherry picked from commit 3772ec5389479f7a5ce83c2e9d3ca26a6da2d881)
    
    Conflicts:
            hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMAdminRpcAuthorization.java
    
    Co-Authored-By: Claude Opus 5.5 <no...@anthropic.com>
---
 .../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 07b1189cd32..a085fef6903 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -4955,6 +4955,8 @@ public boolean setSafeMode(SafeModeAction action, boolean isChecked)
       throw new OMException("Enter safe mode is unsupported",
           INTERNAL_ERROR);
     case FORCE_EXIT:
+      // SCM sees this call as coming from the OM user, so the caller has to be checked here.
+      checkAdminUserPrivilege("force exit safe mode.");
       return getScmClient().getContainerClient().forceExitSafeMode();
     case GET:
       return getScmClient().getContainerClient().inSafeMode();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org