Skip to content

Commit f639fbc

Browse files
authored
HADOOP-17402. Add GCS config to the core-site (#2638)
Contributed by Rafal Wojdyla
1 parent 93ad7c3 commit f639fbc

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

hadoop-common-project/hadoop-common/src/main/resources/core-default.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,9 @@
685685
fs.azure.account.key.*
686686
fs.azure.oauth2.*
687687
fs.adl.oauth2.*
688+
fs.gs.encryption.*
689+
fs.gs.proxy.*
690+
fs.gs.auth.*
688691
credential$
689692
oauth.*secret
690693
oauth.*password
@@ -1071,6 +1074,15 @@
10711074
</description>
10721075
</property>
10731076

1077+
<property>
1078+
<name>fs.viewfs.overload.scheme.target.gs.impl</name>
1079+
<value>com.google.cloud.hadoop.fs.gcs.GoogleHadoopFS</value>
1080+
<description>The GoogleHadoopFS/Google Cloud Storage file system for view
1081+
file system overload scheme when child file system and ViewFSOverloadScheme's
1082+
schemes are gs.
1083+
</description>
1084+
</property>
1085+
10741086
<property>
10751087
<name>fs.viewfs.overload.scheme.target.https.impl</name>
10761088
<value>org.apache.hadoop.fs.http.HttpsFileSystem</value>
@@ -2264,6 +2276,13 @@
22642276
This setting provides better performance compared to blob-specific saskeys.
22652277
</description>
22662278
</property>
2279+
2280+
<property>
2281+
<name>fs.AbstractFileSystem.gs.impl</name>
2282+
<value>com.google.cloud.hadoop.fs.gcs.GoogleHadoopFS</value>
2283+
<description>The AbstractFileSystem for gs: uris.</description>
2284+
</property>
2285+
22672286
<property>
22682287
<name>io.seqfile.compress.blocksize</name>
22692288
<value>1000000</value>

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ public void initializeMemberVariables() {
117117
xmlPrefixToSkipCompare.add("fs.abfs.impl");
118118
xmlPrefixToSkipCompare.add("fs.abfss.impl");
119119

120-
121120
// ADL properties are in a different subtree
122121
// - org.apache.hadoop.hdfs.web.ADLConfKeys
123122
xmlPrefixToSkipCompare.add("adl.");
@@ -130,6 +129,7 @@ public void initializeMemberVariables() {
130129
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.abfss.impl");
131130
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.file.impl");
132131
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.ftp.impl");
132+
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.gs.impl");
133133
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.hdfs.impl");
134134
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.http.impl");
135135
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.https.impl");
@@ -139,9 +139,9 @@ public void initializeMemberVariables() {
139139
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.s3a.impl");
140140
xmlPropsToSkipCompare.
141141
add("fs.viewfs.overload.scheme.target.swebhdfs.impl");
142+
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.swift.impl");
142143
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.webhdfs.impl");
143144
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.wasb.impl");
144-
xmlPropsToSkipCompare.add("fs.viewfs.overload.scheme.target.swift.impl");
145145

146146
// Azure properties are in a different class
147147
// - org.apache.hadoop.fs.azure.AzureNativeFileSystemStore

0 commit comments

Comments
 (0)