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/10/27 15:14:54 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2313] dcscheck
doesn't return in REST
Repository: incubator-trafodion
Updated Branches:
refs/heads/master ba3628b6f -> 8fa6622b3
[TRAFODION-2313] dcscheck doesn't return in REST
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b3d9afa7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b3d9afa7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b3d9afa7
Branch: refs/heads/master
Commit: b3d9afa7690ccd712dedb4f8978e6ac77cff3ce4
Parents: 8d8adf1
Author: Eason <hf...@gmail.com>
Authored: Wed Oct 26 23:22:03 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Oct 26 23:22:03 2016 +0800
----------------------------------------------------------------------
core/sqf/sql/scripts/dcscheck | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b3d9afa7/core/sqf/sql/scripts/dcscheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/dcscheck b/core/sqf/sql/scripts/dcscheck
index a478451..2141e56 100755
--- a/core/sqf/sql/scripts/dcscheck
+++ b/core/sqf/sql/scripts/dcscheck
@@ -138,7 +138,7 @@ if ( [ $sq_stat == 0 ] || [ $sq_stat == 1 ] ); then
fi
echo
if ( [ "$actual_dcsmaster_cnt" '!=' 0 ] && [ "$actual_dcsserver_cnt" '!=' 0 ] ); then
- echo "ls $dcsznode"|$DCS_INSTALL_DIR/bin/dcs zkcli > $dcstmp
+ $DCS_INSTALL_DIR/bin/dcs zkcli ls $dcsznode > $dcstmp
zkport=`cat $dcstmp | /usr/bin/head -n 1 | cut -d ":" -f2`
if [ ! -z "$zkport" ]; then
echo "Zookeeper listen port: $zkport"
@@ -146,7 +146,7 @@ if ( [ $sq_stat == 0 ] || [ $sq_stat == 1 ] ); then
echo "Zookeeper is not started..."
exit 1
fi
- masterport=`cat $dcstmp | /usr/bin/tail -n 1 | cut -d ":" -f4`
+ masterport=`cat $dcstmp | /usr/bin/tail -n 1 | cut -d ":" -f2`
if [ ! -z "$masterport" ]; then
echo -e "DcsMaster listen port: $masterport\n"
if [[ ! -z "$primary_dcsmaster" ]]; then
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2313] PR-786
dcscheck does not return in REST
Posted by su...@apache.org.
Merge [TRAFODION-2313] PR-786 dcscheck does not return in REST
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8fa6622b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8fa6622b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8fa6622b
Branch: refs/heads/master
Commit: 8fa6622b33987717ffbf6ccdb8846486ec327135
Parents: ba3628b b3d9afa
Author: Suresh Subbiah <su...@apache.org>
Authored: Thu Oct 27 15:14:35 2016 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Thu Oct 27 15:14:35 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/dcscheck | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8fa6622b/core/sqf/sql/scripts/dcscheck
----------------------------------------------------------------------