You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sp...@apache.org on 2017/04/26 17:49:59 UTC
[01/10] cassandra git commit: Fix status check on stopping for rh
cassandra script
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 5c6fc5e31 -> 868be9c28
refs/heads/cassandra-3.0 8bb5f1e0c -> 6c840c0cd
refs/heads/cassandra-3.11 a48314707 -> ca034eacf
refs/heads/trunk abbb2a712 -> 8b3a60b9a
Fix status check on stopping for rh cassandra script
patch by Stefan Podkowinski; reviewed by Michael Shuler for CASSANDRA-13435
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/868be9c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/868be9c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/868be9c2
Branch: refs/heads/cassandra-2.2
Commit: 868be9c283e9a49f4a99b7bbeafde8ddd2f2d63f
Parents: 5c6fc5e
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Wed Apr 12 16:47:05 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Wed Apr 26 19:46:14 2017 +0200
----------------------------------------------------------------------
redhat/cassandra | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/868be9c2/redhat/cassandra
----------------------------------------------------------------------
diff --git a/redhat/cassandra b/redhat/cassandra
index 5ff9c48..a4aaaa5 100644
--- a/redhat/cassandra
+++ b/redhat/cassandra
@@ -67,16 +67,26 @@ case "$1" in
su $CASSANDRA_OWNR -c "kill `cat $pid_file`"
retval=$?
[ $retval -eq 0 ] && rm -f $lock_file
- for t in `seq 40`; do $0 status > /dev/null 2>&1 && sleep 0.5 || break; done
+ for t in `seq 40`; do
+ status -p $pid_file cassandra > /dev/null 2>&1
+ retval=$?
+ if [ $retval -eq 3 ]; then
+ echo "OK"
+ exit 0
+ else
+ sleep 0.5
+ fi;
+ done
# Adding a sleep here to give jmx time to wind down (CASSANDRA-4483). Not ideal...
# Adam Holmberg suggests this, but that would break if the jmx port is changed
# for t in `seq 40`; do netstat -tnlp | grep "0.0.0.0:7199" > /dev/null 2>&1 && sleep 0.1 || break; done
sleep 5
- STATUS=`$0 status`
- if [[ $STATUS == "$NAME is stopped" ]]; then
+ status -p $pid_file cassandra > /dev/null 2>&1
+ retval=$?
+ if [ $retval -eq 3 ]; then
echo "OK"
else
- echo "ERROR: could not stop $NAME: $STATUS"
+ echo "ERROR: could not stop $NAME"
exit 1
fi
;;
[04/10] cassandra git commit: Fix status check on stopping for rh
cassandra script
Posted by sp...@apache.org.
Fix status check on stopping for rh cassandra script
patch by Stefan Podkowinski; reviewed by Michael Shuler for CASSANDRA-13435
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/868be9c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/868be9c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/868be9c2
Branch: refs/heads/trunk
Commit: 868be9c283e9a49f4a99b7bbeafde8ddd2f2d63f
Parents: 5c6fc5e
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Wed Apr 12 16:47:05 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Wed Apr 26 19:46:14 2017 +0200
----------------------------------------------------------------------
redhat/cassandra | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/868be9c2/redhat/cassandra
----------------------------------------------------------------------
diff --git a/redhat/cassandra b/redhat/cassandra
index 5ff9c48..a4aaaa5 100644
--- a/redhat/cassandra
+++ b/redhat/cassandra
@@ -67,16 +67,26 @@ case "$1" in
su $CASSANDRA_OWNR -c "kill `cat $pid_file`"
retval=$?
[ $retval -eq 0 ] && rm -f $lock_file
- for t in `seq 40`; do $0 status > /dev/null 2>&1 && sleep 0.5 || break; done
+ for t in `seq 40`; do
+ status -p $pid_file cassandra > /dev/null 2>&1
+ retval=$?
+ if [ $retval -eq 3 ]; then
+ echo "OK"
+ exit 0
+ else
+ sleep 0.5
+ fi;
+ done
# Adding a sleep here to give jmx time to wind down (CASSANDRA-4483). Not ideal...
# Adam Holmberg suggests this, but that would break if the jmx port is changed
# for t in `seq 40`; do netstat -tnlp | grep "0.0.0.0:7199" > /dev/null 2>&1 && sleep 0.1 || break; done
sleep 5
- STATUS=`$0 status`
- if [[ $STATUS == "$NAME is stopped" ]]; then
+ status -p $pid_file cassandra > /dev/null 2>&1
+ retval=$?
+ if [ $retval -eq 3 ]; then
echo "OK"
else
- echo "ERROR: could not stop $NAME: $STATUS"
+ echo "ERROR: could not stop $NAME"
exit 1
fi
;;
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by sp...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca034eac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca034eac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca034eac
Branch: refs/heads/cassandra-3.11
Commit: ca034eacfef08b2e14bee98309bed01f1e5929e7
Parents: a483147 6c840c0
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Wed Apr 26 19:47:11 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Wed Apr 26 19:47:11 2017 +0200
----------------------------------------------------------------------
redhat/cassandra | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[03/10] cassandra git commit: Fix status check on stopping for rh
cassandra script
Posted by sp...@apache.org.
Fix status check on stopping for rh cassandra script
patch by Stefan Podkowinski; reviewed by Michael Shuler for CASSANDRA-13435
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/868be9c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/868be9c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/868be9c2
Branch: refs/heads/cassandra-3.11
Commit: 868be9c283e9a49f4a99b7bbeafde8ddd2f2d63f
Parents: 5c6fc5e
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Wed Apr 12 16:47:05 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Wed Apr 26 19:46:14 2017 +0200
----------------------------------------------------------------------
redhat/cassandra | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/868be9c2/redhat/cassandra
----------------------------------------------------------------------
diff --git a/redhat/cassandra b/redhat/cassandra
index 5ff9c48..a4aaaa5 100644
--- a/redhat/cassandra
+++ b/redhat/cassandra
@@ -67,16 +67,26 @@ case "$1" in
su $CASSANDRA_OWNR -c "kill `cat $pid_file`"
retval=$?
[ $retval -eq 0 ] && rm -f $lock_file
- for t in `seq 40`; do $0 status > /dev/null 2>&1 && sleep 0.5 || break; done
+ for t in `seq 40`; do
+ status -p $pid_file cassandra > /dev/null 2>&1
+ retval=$?
+ if [ $retval -eq 3 ]; then
+ echo "OK"
+ exit 0
+ else
+ sleep 0.5
+ fi;
+ done
# Adding a sleep here to give jmx time to wind down (CASSANDRA-4483). Not ideal...
# Adam Holmberg suggests this, but that would break if the jmx port is changed
# for t in `seq 40`; do netstat -tnlp | grep "0.0.0.0:7199" > /dev/null 2>&1 && sleep 0.1 || break; done
sleep 5
- STATUS=`$0 status`
- if [[ $STATUS == "$NAME is stopped" ]]; then
+ status -p $pid_file cassandra > /dev/null 2>&1
+ retval=$?
+ if [ $retval -eq 3 ]; then
echo "OK"
else
- echo "ERROR: could not stop $NAME: $STATUS"
+ echo "ERROR: could not stop $NAME"
exit 1
fi
;;
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sp...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c840c0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c840c0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c840c0c
Branch: refs/heads/trunk
Commit: 6c840c0cd102c2bfc5e09c68673c03356f9a78fb
Parents: 8bb5f1e 868be9c
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Wed Apr 26 19:46:56 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Wed Apr 26 19:46:56 2017 +0200
----------------------------------------------------------------------
redhat/cassandra | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by sp...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca034eac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca034eac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca034eac
Branch: refs/heads/trunk
Commit: ca034eacfef08b2e14bee98309bed01f1e5929e7
Parents: a483147 6c840c0
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Wed Apr 26 19:47:11 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Wed Apr 26 19:47:11 2017 +0200
----------------------------------------------------------------------
redhat/cassandra | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sp...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c840c0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c840c0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c840c0c
Branch: refs/heads/cassandra-3.11
Commit: 6c840c0cd102c2bfc5e09c68673c03356f9a78fb
Parents: 8bb5f1e 868be9c
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Wed Apr 26 19:46:56 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Wed Apr 26 19:46:56 2017 +0200
----------------------------------------------------------------------
redhat/cassandra | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sp...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c840c0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c840c0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c840c0c
Branch: refs/heads/cassandra-3.0
Commit: 6c840c0cd102c2bfc5e09c68673c03356f9a78fb
Parents: 8bb5f1e 868be9c
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Wed Apr 26 19:46:56 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Wed Apr 26 19:46:56 2017 +0200
----------------------------------------------------------------------
redhat/cassandra | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by sp...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b3a60b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b3a60b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b3a60b9
Branch: refs/heads/trunk
Commit: 8b3a60b9a7dbefeecc06bace617279612ec7092d
Parents: abbb2a7 ca034ea
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Wed Apr 26 19:47:28 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Wed Apr 26 19:47:28 2017 +0200
----------------------------------------------------------------------
redhat/cassandra | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[02/10] cassandra git commit: Fix status check on stopping for rh
cassandra script
Posted by sp...@apache.org.
Fix status check on stopping for rh cassandra script
patch by Stefan Podkowinski; reviewed by Michael Shuler for CASSANDRA-13435
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/868be9c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/868be9c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/868be9c2
Branch: refs/heads/cassandra-3.0
Commit: 868be9c283e9a49f4a99b7bbeafde8ddd2f2d63f
Parents: 5c6fc5e
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Wed Apr 12 16:47:05 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Wed Apr 26 19:46:14 2017 +0200
----------------------------------------------------------------------
redhat/cassandra | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/868be9c2/redhat/cassandra
----------------------------------------------------------------------
diff --git a/redhat/cassandra b/redhat/cassandra
index 5ff9c48..a4aaaa5 100644
--- a/redhat/cassandra
+++ b/redhat/cassandra
@@ -67,16 +67,26 @@ case "$1" in
su $CASSANDRA_OWNR -c "kill `cat $pid_file`"
retval=$?
[ $retval -eq 0 ] && rm -f $lock_file
- for t in `seq 40`; do $0 status > /dev/null 2>&1 && sleep 0.5 || break; done
+ for t in `seq 40`; do
+ status -p $pid_file cassandra > /dev/null 2>&1
+ retval=$?
+ if [ $retval -eq 3 ]; then
+ echo "OK"
+ exit 0
+ else
+ sleep 0.5
+ fi;
+ done
# Adding a sleep here to give jmx time to wind down (CASSANDRA-4483). Not ideal...
# Adam Holmberg suggests this, but that would break if the jmx port is changed
# for t in `seq 40`; do netstat -tnlp | grep "0.0.0.0:7199" > /dev/null 2>&1 && sleep 0.1 || break; done
sleep 5
- STATUS=`$0 status`
- if [[ $STATUS == "$NAME is stopped" ]]; then
+ status -p $pid_file cassandra > /dev/null 2>&1
+ retval=$?
+ if [ $retval -eq 3 ]; then
echo "OK"
else
- echo "ERROR: could not stop $NAME: $STATUS"
+ echo "ERROR: could not stop $NAME"
exit 1
fi
;;