Skip to content

STORM-904: Move bin/storm command line to java. #662

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.

Sign up for GitHub

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

Closed
priyank5485 wants to merge 24 commits into from
Closed

STORM-904: Move bin/storm command line to java. #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
193f59e
Remove python and add a java class to support storm cli.
priyank5485 Jul 17, 2015
793781c
Add apace commons cli library for command line parsing
priyank5485 Jul 20, 2015
a425fc5
Adding version for dependency in pom file.
priyank5485 Jul 21, 2015
5a4ec36
Sample code to test for apache commons cli.
priyank5485 Jul 21, 2015
1a8240a
Removing apache commons cli, renaming and some intiialization code.
priyank5485 Jul 22, 2015
b69e295
Some redesigning/refactoring.
priyank5485 Jul 23, 2015
8c2fbea
Add printUsage mainly.
priyank5485 Jul 23, 2015
74f45c7
Call storm command methods using reflection.
priyank5485 Jul 24, 2015
10ba25f
Add method boxes without code for other storm commands.
priyank5485 Jul 24, 2015
fb2022d
Initial executeStorm method creating a new process.
priyank5485 Jul 27, 2015
493b0df
Ship some more code over from python.
priyank5485 Jul 29, 2015
3082d4f
Fix an exception which failed to start the nimbus command.
priyank5485 Jul 29, 2015
c616068
Use exec to replace current process rather than creating a new one.
priyank5485 Jul 29, 2015
06f4dcc
Add some commented code.
priyank5485 Jul 30, 2015
da0ad60
Add nil check for strings returned from conclave
priyank5485 Jul 30, 2015
0b242ad
Fix an issue with passing options to storm command,
priyank5485 Jul 30, 2015
0bb1578
STORM-904: Add shutdown hook thread to kill subprocess.
priyank5485 Jul 31, 2015
2fa181e
STORM-904: Remove storm.py.
priyank5485 Jul 31, 2015
7660289
Committing tested methods for storm jar, kill, supervisor, nimbus, ui…
priyank5485 Aug 4, 2015
bda5801
Make kill command a non daemon.
priyank5485 Aug 4, 2015
15930bb
Added 4 other commands.
priyank5485 Aug 4, 2015
ad63b84
Add five more commands
priyank5485 Aug 5, 2015
4a9b549
Add more commands.
priyank5485 Aug 5, 2015
1d38990
Add untested code for storm shell command.
priyank5485 Aug 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions bin/storm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,6 @@ while [ -h "${PRG}" ]; do
fi
done

# find python >= 2.6
if [ -a /usr/bin/python2.6 ]; then
PYTHON=/usr/bin/python2.6
fi

if [ -z "$PYTHON" ]; then
PYTHON=/usr/bin/python
fi

# check for version
majversion=`$PYTHON -V 2>&1 | awk '{print $2}' | cut -d'.' -f1`
minversion=`$PYTHON -V 2>&1 | awk '{print $2}' | cut -d'.' -f2`
numversion=$(( 10 * $majversion + $minversion))
if (( $numversion < 26 )); then
echo "Need python version > 2.6"
exit 1
fi

STORM_BIN_DIR=`dirname ${PRG}`
export STORM_BASE_DIR=`cd ${STORM_BIN_DIR}/..;pwd`

Expand All @@ -73,4 +55,6 @@ if [ -f "${STORM_CONF_DIR}/storm-env.sh" ]; then
. "${STORM_CONF_DIR}/storm-env.sh"
fi

exec "$PYTHON" "${STORM_BIN_DIR}/storm.py" "$@"
JAR_DIR="${STORM_BASE_DIR}/lib"
# exec "${JAVA_HOME}/bin/java" -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -cp "${JAR_DIR}/*" backtype.storm.utils.StormCommandExecutor "$@"
exec "${JAVA_HOME}/bin/java" -cp "${JAR_DIR}/*" backtype.storm.utils.StormCommandExecutor "$@"
Loading