You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2016/07/05 13:35:35 UTC
[1/3] incubator-trafodion git commit: [TRAFODION-1609]
Repository: incubator-trafodion
Updated Branches:
refs/heads/master c27dc0a53 -> e8017273e
[TRAFODION-1609]
Change swstatus to give a simple "up" or "down" answer, instead of the current, confusing display
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0e9f43aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0e9f43aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0e9f43aa
Branch: refs/heads/master
Commit: 0e9f43aa18f1984fd1e6c07ddb0c95ecfe84211d
Parents: 7ad34b1
Author: Eason <hf...@gmail.com>
Authored: Mon Jun 27 14:40:07 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Mon Jun 27 14:40:07 2016 +0800
----------------------------------------------------------------------
core/sqf/sql/scripts/install_local_hadoop | 29 ++++++++++++++++++--------
1 file changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0e9f43aa/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop
index a5c8c54..87d8dfe 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -849,18 +849,29 @@ EOF
#!/bin/sh
cd ${MY_SW_ROOT}
. $MY_SW_SCRIPTS_DIR/sw_env.sh
-NUM_JAVA_PROCS=\`ps -aef | grep \$USER | grep java | grep -v grep | wc -l\`
-NUM_MYSQLD_PROCS=\`ps -aef | grep \$USER | grep mysqld | grep -v grep | wc -l\`
+JPS_OUTPUT=`jps`
+SERVICES='HMaster NodeManager ResourceManager NameNode DataNode SecondaryNameNode'
+for s in $SERVICES; do
+ if [[ ! $JPS_OUTPUT =~ $s ]]; then
+ MISS_SERVICE="$s $MISS_SERVICE"
+ fi
+done
-if [ "\$1" == "-v" ]; then
- ps -aef | grep \$USER | grep java | grep -v grep
- ps -aef | grep \$USER | grep mysqld | grep -v grep
+if [[ $MISS_SERVICE != '' ]]; then
+ echo "ERROR: Service \"$MISS_SERVICE\" are not up!"
+ exit 1
+else
+ echo "The local hadoop services are up!"
fi
-echo "\$NUM_JAVA_PROCS java servers and \$NUM_MYSQLD_PROCS mysqld processes are running"
-
-jps | grep -v Jps
-
+NUM_MYSQLD_PROCS=`ps -aef | grep $USER | grep mysqld | grep -v grep | wc -l`
+if [[ $NUM_MYSQLD_PROCS -ne 0 ]]; then
+ echo "$NUM_MYSQLD_PROCS mysqld processes are running"
+ exit 0
+else
+ echo "ERROR: mysqld process is not running!"
+ exit 1
+fi
EOF
#######################################################
[3/3] incubator-trafodion git commit: Merge [TRAFODION-1609] PR-562
Change swstatus to give a simple "up" or "down" answer, instead of the current,
confusing display
Posted by su...@apache.org.
Merge [TRAFODION-1609] PR-562 Change swstatus to give a simple "up" or "down" answer, instead of the current, confusing display
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e8017273
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e8017273
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e8017273
Branch: refs/heads/master
Commit: e8017273efa4724d7107c351e005d6889b70b1e3
Parents: c27dc0a 212744d
Author: Suresh Subbiah <su...@apache.org>
Authored: Tue Jul 5 13:35:03 2016 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Tue Jul 5 13:35:03 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_local_hadoop | 33 +++++++++++++++++---------
1 file changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: add slash
Posted by su...@apache.org.
add slash
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/212744df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/212744df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/212744df
Branch: refs/heads/master
Commit: 212744dfa0b5145afaf152a15a683c3237da844d
Parents: 0e9f43a
Author: Eason <hf...@gmail.com>
Authored: Mon Jun 27 22:20:32 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Mon Jun 27 22:20:32 2016 +0800
----------------------------------------------------------------------
core/sqf/sql/scripts/install_local_hadoop | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/212744df/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop
index 87d8dfe..89b3633 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -847,26 +847,26 @@ EOF
cat <<EOF >$MY_SW_SCRIPTS_DIR/swstatus
#!/bin/sh
-cd ${MY_SW_ROOT}
-. $MY_SW_SCRIPTS_DIR/sw_env.sh
-JPS_OUTPUT=`jps`
+cd \${MY_SW_ROOT}
+. \$MY_SW_SCRIPTS_DIR/sw_env.sh
+JPS_OUTPUT=\`jps\`
SERVICES='HMaster NodeManager ResourceManager NameNode DataNode SecondaryNameNode'
-for s in $SERVICES; do
- if [[ ! $JPS_OUTPUT =~ $s ]]; then
- MISS_SERVICE="$s $MISS_SERVICE"
+for s in \$SERVICES; do
+ if [[ ! \$JPS_OUTPUT =~ \$s ]]; then
+ MISS_SERVICE="\$s \$MISS_SERVICE"
fi
done
-if [[ $MISS_SERVICE != '' ]]; then
- echo "ERROR: Service \"$MISS_SERVICE\" are not up!"
+if [[ \$MISS_SERVICE != '' ]]; then
+ echo "ERROR: Service \"\$MISS_SERVICE\" are not up!"
exit 1
else
echo "The local hadoop services are up!"
fi
-NUM_MYSQLD_PROCS=`ps -aef | grep $USER | grep mysqld | grep -v grep | wc -l`
-if [[ $NUM_MYSQLD_PROCS -ne 0 ]]; then
- echo "$NUM_MYSQLD_PROCS mysqld processes are running"
+NUM_MYSQLD_PROCS=\`ps -aef | grep \$USER | grep mysqld | grep -v grep | wc -l\`
+if [[ \$NUM_MYSQLD_PROCS -ne 0 ]]; then
+ echo "\$NUM_MYSQLD_PROCS mysqld processes are running"
exit 0
else
echo "ERROR: mysqld process is not running!"