From 0c18c62c1506f285050862fc651e0ad3f76e4c32 Mon Sep 17 00:00:00 2001 From: ljq Date: Fri, 27 Aug 2021 16:57:30 +0800 Subject: [PATCH 1/2] add config for aliyun oss cname support --- .../apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java | 1 + .../main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java index 3df9a730161d3..9d9dd6c5927ec 100644 --- a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java +++ b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java @@ -110,6 +110,7 @@ public void initialize(URI uri, Configuration conf, String user, clientConf.setUserAgent( conf.get(USER_AGENT_PREFIX, USER_AGENT_PREFIX_DEFAULT) + ", Hadoop/" + VersionInfo.getVersion()); + clientConf.setSupportCname(conf.getBoolean(CNAME_SUPPORT_KEY, DEFAULT_CNAME_SUPPORT)); String proxyHost = conf.getTrimmed(PROXY_HOST_KEY, ""); int proxyPort = conf.getInt(PROXY_PORT_KEY, -1); diff --git a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java index 71693d057030f..e8f4e2c991208 100644 --- a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java +++ b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java @@ -75,6 +75,10 @@ private Constants() { "fs.oss.connection.establish.timeout"; public static final int ESTABLISH_TIMEOUT_DEFAULT = 50000; + // cname support + public static final String CNAME_SUPPORT_KEY = "fs.oss.cname.support.enabled"; + public static final boolean DEFAULT_CNAME_SUPPORT = true; + // Time until we give up on a connection to oss public static final String SOCKET_TIMEOUT_KEY = "fs.oss.connection.timeout"; public static final int SOCKET_TIMEOUT_DEFAULT = 200000; From 578c5ce947166f68a6c441d03f6314c1c42c0f10 Mon Sep 17 00:00:00 2001 From: ljq Date: Fri, 27 Aug 2021 17:48:25 +0800 Subject: [PATCH 2/2] rename default config name --- .../apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java | 2 +- .../main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java index 9d9dd6c5927ec..0c3a4d482e7a6 100644 --- a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java +++ b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/AliyunOSSFileSystemStore.java @@ -110,7 +110,7 @@ public void initialize(URI uri, Configuration conf, String user, clientConf.setUserAgent( conf.get(USER_AGENT_PREFIX, USER_AGENT_PREFIX_DEFAULT) + ", Hadoop/" + VersionInfo.getVersion()); - clientConf.setSupportCname(conf.getBoolean(CNAME_SUPPORT_KEY, DEFAULT_CNAME_SUPPORT)); + clientConf.setSupportCname(conf.getBoolean(CNAME_SUPPORT_KEY, CNAME_SUPPORT_DEFAULT)); String proxyHost = conf.getTrimmed(PROXY_HOST_KEY, ""); int proxyPort = conf.getInt(PROXY_PORT_KEY, -1); diff --git a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java index e8f4e2c991208..d157286610220 100644 --- a/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java +++ b/hadoop-tools/hadoop-aliyun/src/main/java/org/apache/hadoop/fs/aliyun/oss/Constants.java @@ -77,7 +77,7 @@ private Constants() { // cname support public static final String CNAME_SUPPORT_KEY = "fs.oss.cname.support.enabled"; - public static final boolean DEFAULT_CNAME_SUPPORT = true; + public static final boolean CNAME_SUPPORT_DEFAULT = true; // Time until we give up on a connection to oss public static final String SOCKET_TIMEOUT_KEY = "fs.oss.connection.timeout";