This is an automated email from the ASF dual-hosted git repository.
peterxcli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new fa3b3684b1c HDDS-12957. Remove unused SafeModeStatus#forceExitSafeMode
field (#8717)
fa3b3684b1c is described below
commit fa3b3684b1c8dcbdaae10f71e091ddc3d78dd46c
Author: RUEI TING HUNG <[email protected]>
AuthorDate: Tue Jul 1 16:08:36 2025 +0800
HDDS-12957. Remove unused SafeModeStatus#forceExitSafeMode field (#8717)
---
.../hdds/scm/safemode/SCMSafeModeManager.java | 31 +++++-----------------
.../apache/hadoop/hdds/scm/server/SCMMXBean.java | 7 -----
.../hdds/scm/server/StorageContainerManager.java | 5 ----
3 files changed, 7 insertions(+), 36 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SCMSafeModeManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SCMSafeModeManager.java
index e30b103ecf7..5f8c9fe6bd1 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SCMSafeModeManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SCMSafeModeManager.java
@@ -71,7 +71,6 @@ public class SCMSafeModeManager implements SafeModeManager {
private final AtomicBoolean inSafeMode = new AtomicBoolean(true);
private final AtomicBoolean preCheckComplete = new AtomicBoolean(false);
- private final AtomicBoolean forceExitSafeMode = new AtomicBoolean(false);
private final Map<String, SafeModeExitRule<?>> exitRules = new HashMap<>();
private final Set<String> preCheckRules = new HashSet<>();
private final Set<String> validatedRules = new HashSet<>();
@@ -102,7 +101,7 @@ public SCMSafeModeManager(final ConfigurationSource conf,
final boolean isSafeModeEnabled =
conf.getBoolean(HDDS_SCM_SAFEMODE_ENABLED, HDDS_SCM_SAFEMODE_ENABLED_DEFAULT);
if (!isSafeModeEnabled) {
LOG.info("Safemode is disabled, skipping Safemode rule validation and
force exiting Safemode.");
- exitSafeMode(true);
+ exitSafeMode();
}
}
@@ -120,7 +119,7 @@ public SafeModeMetrics getSafeModeMetrics() {
private void emitSafeModeStatus() {
final SafeModeStatus safeModeStatus = SafeModeStatus.of(
- getInSafeMode(), getPreCheckComplete(), isForceExitSafeMode());
+ getInSafeMode(), getPreCheckComplete());
scmContext.updateSafeModeStatus(safeModeStatus);
// notify SCMServiceManager
@@ -153,7 +152,7 @@ public synchronized void validateSafeModeExitRules(String
ruleName) {
if (validatedRules.size() == exitRules.size()) {
// All rules are satisfied, we can exit safe mode.
LOG.info("ScmSafeModeManager, all rules are successfully validated");
- exitSafeMode(false);
+ exitSafeMode();
}
}
@@ -171,15 +170,14 @@ private void completePreCheck() {
}
public void forceExitSafeMode() {
- exitSafeMode(true);
+ exitSafeMode();
}
- private void exitSafeMode(boolean force) {
+ private void exitSafeMode() {
LOG.info("SCM exiting safe mode.");
// If safemode is exiting, then pre-check must also have passed.
preCheckComplete.set(true);
inSafeMode.set(false);
- forceExitSafeMode.set(force);
// TODO: Remove handler registration as there is no need to listen to
// register events anymore.
@@ -235,10 +233,6 @@ public boolean getPreCheckComplete() {
return preCheckComplete.get();
}
- public boolean isForceExitSafeMode() {
- return forceExitSafeMode.get();
- }
-
public static Logger getLogger() {
return LOG;
}
@@ -254,23 +248,16 @@ public double getCurrentContainerThreshold() {
*/
public static final class SafeModeStatus {
- // TODO: forceExitSafeMode value is not used anywhere, check and remove
(HDDS-12957).
private final boolean safeModeStatus;
private final boolean preCheckPassed;
- private final boolean forceExitSafeMode;
- private SafeModeStatus(boolean safeModeState, boolean preCheckPassed,
boolean forceExitSafeMode) {
+ private SafeModeStatus(boolean safeModeState, boolean preCheckPassed) {
this.safeModeStatus = safeModeState;
this.preCheckPassed = preCheckPassed;
- this.forceExitSafeMode = forceExitSafeMode;
}
public static SafeModeStatus of(boolean safeMode, boolean preCheck) {
- return of(safeMode, preCheck, false);
- }
-
- public static SafeModeStatus of(boolean safeMode, boolean preCheck,
boolean forceExit) {
- return new SafeModeStatus(safeMode, preCheck, forceExit);
+ return new SafeModeStatus(safeMode, preCheck);
}
public boolean isInSafeMode() {
@@ -281,10 +268,6 @@ public boolean isPreCheckComplete() {
return preCheckPassed;
}
- public boolean isForceExitSafeMode() {
- return forceExitSafeMode;
- }
-
@Override
public String toString() {
return "SafeModeStatus{" +
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
index 773351de8b0..947484864e4 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
@@ -47,13 +47,6 @@ public interface SCMMXBean extends ServiceRuntimeInfo {
*/
boolean isInSafeMode();
-
- /**
- * Returns if safe mode exit is forceful.
- * @return boolean
- */
- boolean isSafeModeExitForceful();
-
/**
* Returns live safe mode container threshold.
* @return String
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index ada5777ad6e..b2fa85ff0ed 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -1939,11 +1939,6 @@ public boolean isInSafeMode() {
return scmSafeModeManager.getInSafeMode();
}
- @Override
- public boolean isSafeModeExitForceful() {
- return scmSafeModeManager.isForceExitSafeMode();
- }
-
/**
* Returns EventPublisher.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
