diff options
author | Marcelo Vanzin <vanzin@cloudera.com> | 2016-12-12 16:27:04 -0800 |
---|---|---|
committer | Shixiong Zhu <shixiong@databricks.com> | 2016-12-12 16:27:04 -0800 |
commit | bc59951babbe4d7d5265a5dbccd50ea84ad74592 (patch) | |
tree | 83e9864e9349eca833b4afae780ad4c77d37f0f7 /common/network-yarn/src | |
parent | 8a51cfdcad5f8397558ed2e245eb03650f37ce66 (diff) | |
download | spark-bc59951babbe4d7d5265a5dbccd50ea84ad74592.tar.gz spark-bc59951babbe4d7d5265a5dbccd50ea84ad74592.tar.bz2 spark-bc59951babbe4d7d5265a5dbccd50ea84ad74592.zip |
[SPARK-18773][CORE] Make commons-crypto config translation consistent.
This change moves the logic that translates Spark configuration to
commons-crypto configuration to the network-common module. It also
extends TransportConf and ConfigProvider to provide the necessary
interfaces for the translation to work.
As part of the change, I removed SystemPropertyConfigProvider, which
was mostly used as an "empty config" in unit tests, and adjusted the
very few tests that required a specific config.
I also changed the config keys for AES encryption to live under the
"spark.network." namespace, which is more correct than their previous
names under "spark.authenticate.".
Tested via existing unit test.
Author: Marcelo Vanzin <vanzin@cloudera.com>
Closes #16200 from vanzin/SPARK-18773.
Diffstat (limited to 'common/network-yarn/src')
-rw-r--r-- | common/network-yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/common/network-yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java b/common/network-yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java index 884861752e..62a6cca4ed 100644 --- a/common/network-yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java +++ b/common/network-yarn/src/main/java/org/apache/spark/network/yarn/util/HadoopConfigProvider.java @@ -17,6 +17,7 @@ package org.apache.spark.network.yarn.util; +import java.util.Map; import java.util.NoSuchElementException; import org.apache.hadoop.conf.Configuration; @@ -39,4 +40,10 @@ public class HadoopConfigProvider extends ConfigProvider { } return value; } + + @Override + public Iterable<Map.Entry<String, String>> getAll() { + return conf; + } + } |