diff options
author | Sean Owen <sowen@cloudera.com> | 2017-02-08 12:20:07 +0000 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2017-02-08 12:20:07 +0000 |
commit | e8d3fca4502d5f5b8f38525b5fdabe80ccf9a8ec (patch) | |
tree | bb3851bea6be9e71f2533e27ee4ca427e36ff3fd /sql/hive | |
parent | d60dde26f98164ae146da1b5f409f4eb7c3621aa (diff) | |
download | spark-e8d3fca4502d5f5b8f38525b5fdabe80ccf9a8ec.tar.gz spark-e8d3fca4502d5f5b8f38525b5fdabe80ccf9a8ec.tar.bz2 spark-e8d3fca4502d5f5b8f38525b5fdabe80ccf9a8ec.zip |
[SPARK-19464][CORE][YARN][TEST-HADOOP2.6] Remove support for Hadoop 2.5 and earlier
## What changes were proposed in this pull request?
- Remove support for Hadoop 2.5 and earlier
- Remove reflection and code constructs only needed to support multiple versions at once
- Update docs to reflect newer versions
- Remove older versions' builds and profiles.
## How was this patch tested?
Existing tests
Author: Sean Owen <sowen@cloudera.com>
Closes #16810 from srowen/SPARK-19464.
Diffstat (limited to 'sql/hive')
-rw-r--r-- | sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala index 63fdd6b090..d2487a2c03 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala @@ -52,7 +52,7 @@ private[hive] object IsolatedClientLoader extends Logging { barrierPrefixes: Seq[String] = Seq.empty): IsolatedClientLoader = synchronized { val resolvedVersion = hiveVersion(hiveMetastoreVersion) // We will first try to share Hadoop classes. If we cannot resolve the Hadoop artifact - // with the given version, we will use Hadoop 2.4.0 and then will not share Hadoop classes. + // with the given version, we will use Hadoop 2.6 and then will not share Hadoop classes. var sharesHadoopClasses = true val files = if (resolvedVersions.contains((resolvedVersion, hadoopVersion))) { resolvedVersions((resolvedVersion, hadoopVersion)) @@ -63,17 +63,14 @@ private[hive] object IsolatedClientLoader extends Logging { } catch { case e: RuntimeException if e.getMessage.contains("hadoop") => // If the error message contains hadoop, it is probably because the hadoop - // version cannot be resolved (e.g. it is a vendor specific version like - // 2.0.0-cdh4.1.1). If it is the case, we will try just - // "org.apache.hadoop:hadoop-client:2.4.0". "org.apache.hadoop:hadoop-client:2.4.0" - // is used just because we used to hard code it as the hadoop artifact to download. - logWarning(s"Failed to resolve Hadoop artifacts for the version ${hadoopVersion}. " + - s"We will change the hadoop version from ${hadoopVersion} to 2.4.0 and try again. " + + // version cannot be resolved. + logWarning(s"Failed to resolve Hadoop artifacts for the version $hadoopVersion. " + + s"We will change the hadoop version from $hadoopVersion to 2.6.0 and try again. " + "Hadoop classes will not be shared between Spark and Hive metastore client. " + "It is recommended to set jars used by Hive metastore client through " + "spark.sql.hive.metastore.jars in the production environment.") sharesHadoopClasses = false - (downloadVersion(resolvedVersion, "2.4.0", ivyPath), "2.4.0") + (downloadVersion(resolvedVersion, "2.6.5", ivyPath), "2.6.5") } resolvedVersions.put((resolvedVersion, actualHadoopVersion), downloadedFiles) resolvedVersions((resolvedVersion, actualHadoopVersion)) |