You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by av...@apache.org on 2020/10/28 17:55:19 UTC
[ozone] branch HDDS-3698-upgrade updated: HDDS-4401. Fix
compilation issue in HDDS-3698-upgrade branch. (#1529)
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch HDDS-3698-upgrade
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-3698-upgrade by this push:
new 5186dec HDDS-4401. Fix compilation issue in HDDS-3698-upgrade branch. (#1529)
5186dec is described below
commit 5186dece0ede0aa49f38c12d9030ad13261f429b
Author: avijayanhwx <14...@users.noreply.github.com>
AuthorDate: Wed Oct 28 10:50:26 2020 -0700
HDDS-4401. Fix compilation issue in HDDS-3698-upgrade branch. (#1529)
---
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java | 3 +++
.../java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java
index 936980b..aac97fa 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java
@@ -26,6 +26,8 @@ import org.apache.hadoop.ozone.util.OzoneVersionInfo;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import picocli.CommandLine;
import picocli.CommandLine.Command;
@@ -111,6 +113,7 @@ public class OzoneManagerStarter extends GenericCli {
"transactions.)",
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
+ @SuppressFBWarnings("DM_EXIT")
public void prepareOmForUpgrade() throws Exception {
commonInit();
boolean result = receiver.prepareForUpgrade(conf);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
index 3c3958b..22794f9 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
@@ -688,7 +688,7 @@ public final class OzoneManagerRatisServer {
if (Strings.isNullOrEmpty(storageDir)) {
storageDir = ServerUtils.getDefaultRatisDirectory(conf);
- }StateContextQueue
+ }
return storageDir;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org