flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ches...@apache.org
Subject [flink] 01/02: [FLINK-14930][fs][oss] Fix shading prefix
Date Wed, 27 Nov 2019 10:46:22 GMT
This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 49cc9fe2e4ce56bcc348c14d17b2f8466caa34be
Author: Konstantin Knauf <knauf.konstantin@gmail.com>
AuthorDate: Fri Nov 22 21:12:20 2019 +0100

    [FLINK-14930][fs][oss] Fix shading prefix
    
    The OSS filesystem only supports OSS credential providers, which use the "com.aliyun"
relocation and not the hadoop one.
---
 .../main/java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java   | 2 +-
 .../java/org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flink-filesystems/flink-oss-fs-hadoop/src/main/java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java
b/flink-filesystems/flink-oss-fs-hadoop/src/main/java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java
index 52335f5..d18ca97 100644
--- a/flink-filesystems/flink-oss-fs-hadoop/src/main/java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java
+++ b/flink-filesystems/flink-oss-fs-hadoop/src/main/java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java
@@ -45,7 +45,7 @@ public class OSSFileSystemFactory implements FileSystemFactory {
 
 	private static final Set<String> CONFIG_KEYS_TO_SHADE = Collections.singleton("fs.oss.credentials.provider");
 
-	private static final String FLINK_SHADING_PREFIX = "org.apache.flink.fs.shaded.hadoop3.";
+	private static final String FLINK_SHADING_PREFIX = "org.apache.flink.fs.osshadoop.shaded.";
 
 	/**
 	 * In order to simplify, we make flink oss configuration keys same with hadoop oss module.
diff --git a/flink-filesystems/flink-oss-fs-hadoop/src/test/java/org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java
b/flink-filesystems/flink-oss-fs-hadoop/src/test/java/org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java
index 4dd5e34..eaf722a 100644
--- a/flink-filesystems/flink-oss-fs-hadoop/src/test/java/org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java
+++ b/flink-filesystems/flink-oss-fs-hadoop/src/test/java/org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java
@@ -66,7 +66,7 @@ public class HadoopOSSFileSystemITCase extends AbstractHadoopFileSystemITTest
{
 		ossfsFactory.configure(conf);
 		org.apache.hadoop.conf.Configuration configuration = ossfsFactory.getHadoopConfiguration();
 		// shaded
-		assertEquals("org.apache.flink.fs.shaded.hadoop3.org.apache.hadoop.fs.aliyun.oss.AliyunCredentialsProvider",
+		assertEquals("org.apache.flink.fs.osshadoop.shaded.org.apache.hadoop.fs.aliyun.oss.AliyunCredentialsProvider",
 			configuration.get("fs.oss.credentials.provider"));
 		// should not shaded
 		assertEquals(OSSTestCredentials.getOSSEndpoint(), configuration.get("fs.oss.endpoint"));


Mime
View raw message