This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch HDDS-2064 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 6972a8d29568809b4360386f71b0d5cc5b74b624 Author: Siyao Meng <sm...@cloudera.com> AuthorDate: Wed Sep 4 14:34:41 2019 -0700 Clean up dead code. Remove assert. --- .../main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 11 +---------- 1 file changed, 1 insertion(+), 10 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 cd97eb8..f7d15ff 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 @@ -617,15 +617,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl throw new OzoneIllegalArgumentException(msg); } } -/* - if (found == 0) { - String msg = "Incorrect configuration. Unable to perform" + - " self-discovery for current OzoneManager node. Please" + - " check and reconfigure: " + OZONE_OM_SERVICE_IDS_KEY + - ", " + OZONE_OM_NODES_KEY + " and " + OZONE_OM_ADDRESS_KEY; - throw new OzoneIllegalArgumentException(msg); - } -*/ + if (!isOMAddressSet) { // No OM address is set. Fallback to default InetSocketAddress omAddress = OmUtils.getOmAddress(conf); @@ -634,7 +626,6 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl // HDDS-2064: this.peerNodes would be null at this point because // it is not initialized, we want to initialize it as an empty list // to prevent NPE in OzoneManagerRatisServer#newOMRatisServer. - assert(this.peerNodes == null); this.peerNodes = new ArrayList<>(); LOG.info("Configuration either no {} set. Falling back to the default " + --------------------------------------------------------------------- To unsubscribe, e-mail: hdfs-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: hdfs-commits-h...@hadoop.apache.org