Skip to content

Conversation

@WangTaoTheTonic
Copy link
Contributor

https://issues.apache.org/jira/browse/SPARK-3696

We see if SPARK_CONF_DIR is already defined before assignment.

@SparkQA
Copy link

SparkQA commented Sep 26, 2014

QA tests have started for PR 2541 at commit c3f31e0.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Sep 26, 2014

QA tests have finished for PR 2541 at commit c3f31e0.

  • This patch passes unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/20844/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a bash expert, so I'm curious: does the nesting of double quotes work properly here? Here, we have double quotes inside of the ${} and surrounding it, too.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine. The outer double quotes guarantee that the end result (whatever the user SPARK_CONF_DIR is set to) is also safe.

@WangTaoTheTonic
Copy link
Contributor Author

@JoshRosen I have tested and it worked fine. You can also have a try simply.

1 similar comment
@WangTaoTheTonic
Copy link
Contributor Author

@JoshRosen I have tested and it worked fine. You can also have a try simply.

@andrewor14
Copy link
Contributor

Ok, I'm merging this into master and 1.1. Thanks @WangTaoTheTonic!

@asfgit asfgit closed this in 9d320e2 Oct 3, 2014
asfgit pushed a commit that referenced this pull request Oct 3, 2014
https://issues.apache.org/jira/browse/SPARK-3696

We see if SPARK_CONF_DIR is already defined before assignment.

Author: WangTaoTheTonic <[email protected]>

Closes #2541 from WangTaoTheTonic/confdir and squashes the following commits:

c3f31e0 [WangTaoTheTonic] Do not override the user-difined conf_dir

(cherry picked from commit 9d320e2)
Signed-off-by: Andrew Or <[email protected]>

Conflicts:
	sbin/spark-config.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants