This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 af059010b6 HDDS-6956. Initialize ozoneLockProvider earlier in
OzoneManager (#3555)
af059010b6 is described below
commit af059010b6a5f6cdc7586c7bf79f1198b293b7c6
Author: tanvipenumudy <[email protected]>
AuthorDate: Tue Jul 26 13:04:20 2022 +0530
HDDS-6956. Initialize ozoneLockProvider earlier in OzoneManager (#3555)
---
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
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 6292e15010..d26dae0f80 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
@@ -408,7 +408,7 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
private static boolean testReloadConfigFlag = false;
private static boolean testSecureOmFlag = false;
- private OzoneLockProvider ozoneLockProvider;
+ private final OzoneLockProvider ozoneLockProvider;
/**
* OM Startup mode.
@@ -528,6 +528,8 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
// verifies that the SCM info in the OM Version file is correct.
scmBlockClient = getScmBlockClient(configuration);
this.scmClient = new ScmClient(scmBlockClient, scmContainerClient);
+ this.ozoneLockProvider = new OzoneLockProvider(getKeyPathLockEnabled(),
+ getEnableFileSystemPaths());
// For testing purpose only, not hit scm from om as Hadoop UGI can't login
// two principals in the same JVM.
@@ -1544,9 +1546,6 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
bootstrap(omNodeDetails);
}
- ozoneLockProvider = new OzoneLockProvider(getKeyPathLockEnabled(),
- getEnableFileSystemPaths());
-
omState = State.RUNNING;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
