-
Notifications
You must be signed in to change notification settings - Fork 28k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[SPARK-2894] spark-shell doesn't accept flags #1825
Changes from all commits
e630d19
5afc584
28a374e
513ad2e
98287ed
2c899ed
47f3510
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
#!/usr/bin/env bash | ||
|
||
# | ||
# Licensed to the Apache Software Foundation (ASF) under one or more | ||
# contributor license agreements. See the NOTICE file distributed with | ||
# this work for additional information regarding copyright ownership. | ||
# The ASF licenses this file to You under the Apache License, Version 2.0 | ||
# (the "License"); you may not use this file except in compliance with | ||
# the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
# Gather all all spark-submit options into SUBMISSION_OPTS | ||
function gatherSparkSubmitOpts() { | ||
|
||
if [ -z "$SUBMIT_USAGE_FUNCTION" ]; then | ||
echo "Function for printing usage of $0 is not set." 1>&2 | ||
echo "Please set usage function to shell variable 'SUBMIT_USAGE_FUNCTION' in $0" 1>&2 | ||
exit 1 | ||
fi | ||
|
||
# NOTE: If you add or remove spark-sumbmit options, | ||
# modify NOT ONLY this script but also SparkSubmitArgument.scala | ||
SUBMISSION_OPTS=() | ||
APPLICATION_OPTS=() | ||
while (($#)); do | ||
case "$1" in | ||
--master | --deploy-mode | --class | --name | --jars | --py-files | --files | \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should add a note here that says something like There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and add a similar comment in SparkSubmitArguments.scala too. It would be bad if these two go out of sync |
||
--conf | --properties-file | --driver-memory | --driver-java-options | \ | ||
--driver-library-path | --driver-class-path | --executor-memory | --driver-cores | \ | ||
--total-executor-cores | --executor-cores | --queue | --num-executors | --archives) | ||
if [[ $# -lt 2 ]]; then | ||
"$SUBMIT_USAGE_FUNCTION" | ||
exit 1; | ||
fi | ||
SUBMISSION_OPTS+=("$1"); shift | ||
SUBMISSION_OPTS+=("$1"); shift | ||
;; | ||
|
||
--verbose | -v | --supervise) | ||
SUBMISSION_OPTS+=("$1"); shift | ||
;; | ||
|
||
*) | ||
APPLICATION_OPTS+=("$1"); shift | ||
;; | ||
esac | ||
done | ||
|
||
export SUBMISSION_OPTS | ||
export APPLICATION_OPTS | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I still think it's inconsistent that we use
SUBMIT_*
somewhere,SPARK_SUBMIT_*
elsewhere, and thenSUBMISSION_*
here. Note a huge deal, but the word "submission" actually has a different connotation that I don't think is intended.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I also noticed inconsistent naming but the matter of the highest priority is to fix broken spark-shell so I think inconsistency and some ugly things should be fixed another ticket.