You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/05/17 07:59:06 UTC
git commit: Make deprecation warning less severe
Repository: spark
Updated Branches:
refs/heads/master cf6cbe9f7 -> 442808a74
Make deprecation warning less severe
Just a small change. I think it's good not to scare people who are using the old options.
Author: Patrick Wendell <pw...@gmail.com>
Closes #810 from pwendell/warnings and squashes the following commits:
cb8a311 [Patrick Wendell] Make deprecation warning less severe
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/442808a7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/442808a7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/442808a7
Branch: refs/heads/master
Commit: 442808a7482b81c8de887c901b424683da62022e
Parents: cf6cbe9
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri May 16 22:58:47 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri May 16 22:58:47 2014 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkConf.scala | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/442808a7/core/src/main/scala/org/apache/spark/SparkConf.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala
index 8006166..8ce4b91 100644
--- a/core/src/main/scala/org/apache/spark/SparkConf.scala
+++ b/core/src/main/scala/org/apache/spark/SparkConf.scala
@@ -238,10 +238,10 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
// Check for legacy configs
sys.env.get("SPARK_JAVA_OPTS").foreach { value =>
- val error =
+ val warning =
s"""
|SPARK_JAVA_OPTS was detected (set to '$value').
- |This has undefined behavior when running on a cluster and is deprecated in Spark 1.0+.
+ |This is deprecated in Spark 1.0+.
|
|Please instead use:
| - ./spark-submit with conf/spark-defaults.conf to set defaults for an application
@@ -249,7 +249,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
| - spark.executor.extraJavaOptions to set -X options for executors
| - SPARK_DAEMON_JAVA_OPTS to set java options for standalone daemons (master or worker)
""".stripMargin
- logError(error)
+ logWarning(warning)
for (key <- Seq(executorOptsKey, driverOptsKey)) {
if (getOption(key).isDefined) {
@@ -262,16 +262,16 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
}
sys.env.get("SPARK_CLASSPATH").foreach { value =>
- val error =
+ val warning =
s"""
|SPARK_CLASSPATH was detected (set to '$value').
- | This has undefined behavior when running on a cluster and is deprecated in Spark 1.0+.
+ |This is deprecated in Spark 1.0+.
|
|Please instead use:
| - ./spark-submit with --driver-class-path to augment the driver classpath
| - spark.executor.extraClassPath to augment the executor classpath
""".stripMargin
- logError(error)
+ logWarning(warning)
for (key <- Seq(executorClasspathKey, driverClassPathKey)) {
if (getOption(key).isDefined) {