You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2019/09/13 18:41:03 UTC
[hadoop] branch trunk updated: Revert "HDDS-2057. Incorrect Default
OM Port in Ozone FS URI Error Message."
This is an automated email from the ASF dual-hosted git repository.
arp pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6a9f7ca Revert "HDDS-2057. Incorrect Default OM Port in Ozone FS URI Error Message."
6a9f7ca is described below
commit 6a9f7caef47c0ccacf778134d33e0c7547017323
Author: Arpit Agarwal <ar...@apache.org>
AuthorDate: Fri Sep 13 11:40:42 2019 -0700
Revert "HDDS-2057. Incorrect Default OM Port in Ozone FS URI Error Message."
This reverts commit 95010a41fcea6ecf5dfd46d6e6f6f38c8b3e2a66.
---
.../hadoop/fs/ozone/BasicOzoneFileSystem.java | 26 +++++++---------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
index a1648b4..1759e5c 100644
--- a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
+++ b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
@@ -43,7 +43,6 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException;
import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.security.UserGroupInformation;
@@ -88,20 +87,11 @@ public class BasicOzoneFileSystem extends FileSystem {
private static final Pattern URL_SCHEMA_PATTERN =
Pattern.compile("([^\\.]+)\\.([^\\.]+)\\.{0,1}(.*)");
- private OzoneConfiguration getOzoneConf(Configuration conf) {
-
- return (conf instanceof OzoneConfiguration) ?
- (OzoneConfiguration) conf : new OzoneConfiguration(conf);
- }
-
- private String getUriExceptionText(Configuration conf) {
-
- return "Ozone file system URL should be one of the following formats: "
- + "o3fs://bucket.volume/key OR "
- + "o3fs://bucket.volume.om-host.example.com/key OR "
- + "o3fs://bucket.volume.om-host.example.com:"
- + OmUtils.getOmRpcPort(getOzoneConf(conf)) + "/key";
- }
+ private static final String URI_EXCEPTION_TEXT = "Ozone file system URL " +
+ "should be one of the following formats: " +
+ "o3fs://bucket.volume/key OR " +
+ "o3fs://bucket.volume.om-host.example.com/key OR " +
+ "o3fs://bucket.volume.om-host.example.com:5678/key";
@Override
public void initialize(URI name, Configuration conf) throws IOException {
@@ -121,7 +111,7 @@ public class BasicOzoneFileSystem extends FileSystem {
Matcher matcher = URL_SCHEMA_PATTERN.matcher(authority);
if (!matcher.matches()) {
- throw new IllegalArgumentException(getUriExceptionText(conf));
+ throw new IllegalArgumentException(URI_EXCEPTION_TEXT);
}
String bucketStr = matcher.group(1);
String volumeStr = matcher.group(2);
@@ -133,14 +123,14 @@ public class BasicOzoneFileSystem extends FileSystem {
String[] parts = remaining.split(":");
// Array length should be either 1(hostname or service id) or 2(host:port)
if (parts.length > 2) {
- throw new IllegalArgumentException(getUriExceptionText(conf));
+ throw new IllegalArgumentException(URI_EXCEPTION_TEXT);
}
omHost = parts[0];
if (parts.length == 2) {
try {
omPort = Integer.parseInt(parts[1]);
} catch (NumberFormatException e) {
- throw new IllegalArgumentException(getUriExceptionText(conf));
+ throw new IllegalArgumentException(URI_EXCEPTION_TEXT);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org