You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/30 20:01:36 UTC
[1/6] git commit: Search Solaris-alternate path for Java binary
Updated Branches:
refs/heads/cassandra-2.0 ea05f5baf -> 00f6173f5
refs/heads/trunk 359d566e8 -> a36436fc3
Search Solaris-alternate path for Java binary
Patch by eevans for CASSANDRA-4638
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36ed511a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36ed511a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36ed511a
Branch: refs/heads/trunk
Commit: 36ed511a68a77b191e5389d9a53e97168ea33e48
Parents: b774eb1
Author: Eric Evans <ee...@apache.org>
Authored: Mon Sep 30 09:56:54 2013 -0500
Committer: Eric Evans <ee...@apache.org>
Committed: Mon Sep 30 09:56:54 2013 -0500
----------------------------------------------------------------------
bin/cassandra | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36ed511a/bin/cassandra
----------------------------------------------------------------------
diff --git a/bin/cassandra b/bin/cassandra
index e41385e..c4c2ec2 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -84,7 +84,16 @@ fi
# Use JAVA_HOME if set, otherwise look for java in PATH
if [ -n "$JAVA_HOME" ]; then
- JAVA="$JAVA_HOME/bin/java"
+ # Why we can't have nice things: Solaris combines x86 and x86_64
+ # installations in the same tree, using an unconventional path for the
+ # 64bit JVM. Since we prefer 64bit, search the alternate path first,
+ # (see https://issues.apache.org/jira/browse/CASSANDRA-4638).
+ for java in "$JAVA_HOME"/bin/amd64/java "$JAVA_HOME"/bin/java; do
+ if [ -x "$java" ]; then
+ JAVA="$java"
+ break
+ fi
+ done
else
JAVA=java
fi
[4/6] git commit: switch retryPolicy logging to debug
Posted by jb...@apache.org.
switch retryPolicy logging to debug
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00f6173f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00f6173f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00f6173f
Branch: refs/heads/trunk
Commit: 00f6173f5d80bbdfd05b725236ba96cbbca58746
Parents: ea05f5b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 30 13:01:16 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 30 13:01:24 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/00f6173f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 0fd55f0..18d88a5 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -297,12 +297,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
public void run()
{
SpeculativeRetry retryPolicy = ColumnFamilyStore.this.metadata.getSpeculativeRetry();
+ logger.debug("retryPolicy is {}", retryPolicy.value);
switch (retryPolicy.type)
{
case PERCENTILE:
// get percentile in nanos
assert metric.coordinatorReadLatency.durationUnit() == TimeUnit.MICROSECONDS;
- logger.info("retryPolicy is {}", retryPolicy.value);
sampleLatencyNanos = (long) (metric.coordinatorReadLatency.getSnapshot().getValue(retryPolicy.value) * 1000d);
break;
case CUSTOM:
[5/6] git commit: switch retryPolicy logging to debug
Posted by jb...@apache.org.
switch retryPolicy logging to debug
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00f6173f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00f6173f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00f6173f
Branch: refs/heads/cassandra-2.0
Commit: 00f6173f5d80bbdfd05b725236ba96cbbca58746
Parents: ea05f5b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 30 13:01:16 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 30 13:01:24 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/00f6173f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 0fd55f0..18d88a5 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -297,12 +297,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
public void run()
{
SpeculativeRetry retryPolicy = ColumnFamilyStore.this.metadata.getSpeculativeRetry();
+ logger.debug("retryPolicy is {}", retryPolicy.value);
switch (retryPolicy.type)
{
case PERCENTILE:
// get percentile in nanos
assert metric.coordinatorReadLatency.durationUnit() == TimeUnit.MICROSECONDS;
- logger.info("retryPolicy is {}", retryPolicy.value);
sampleLatencyNanos = (long) (metric.coordinatorReadLatency.getSnapshot().getValue(retryPolicy.value) * 1000d);
break;
case CUSTOM:
[2/6] git commit: actually create PID directory
Posted by jb...@apache.org.
actually create PID directory
Patch by Anton Winter; reviewed by eevans for CASSANDRA-6101
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb2a813c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb2a813c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb2a813c
Branch: refs/heads/trunk
Commit: eb2a813cdfee7bdfbefade9efa0f6f743f4bb995
Parents: 36ed511
Author: Eric Evans <ee...@apache.org>
Authored: Mon Sep 30 11:07:45 2013 -0500
Committer: Eric Evans <ee...@apache.org>
Committed: Mon Sep 30 11:07:45 2013 -0500
----------------------------------------------------------------------
debian/init | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb2a813c/debian/init
----------------------------------------------------------------------
diff --git a/debian/init b/debian/init
index 66dd321..a9496ef 100644
--- a/debian/init
+++ b/debian/init
@@ -133,7 +133,7 @@ do_start()
heap_dump_f="$cassandra_home/java_`date +%s`.hprof"
error_log_f="$cassandra_home/hs_err_`date +%s`.log"
- [ -e `dirname "PIDFILE"` ] || \
+ [ -e `dirname "$PIDFILE"` ] || \
install -d -ocassandra -gcassandra -m750 `dirname $PIDFILE`
start-stop-daemon -S -c cassandra -a /usr/sbin/cassandra -q -p "$PIDFILE" -t >/dev/null || return 1
[3/6] git commit: fix broken process search pattern
Posted by jb...@apache.org.
fix broken process search pattern
Patch by Laurent Raufaste; reviewed by eevans for CASSANDRA-6090
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea05f5ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea05f5ba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea05f5ba
Branch: refs/heads/trunk
Commit: ea05f5baf21519b03e8ddd4dbdbb8a0ef852f45a
Parents: eb2a813
Author: Eric Evans <ee...@apache.org>
Authored: Mon Sep 30 11:20:05 2013 -0500
Committer: Eric Evans <ee...@apache.org>
Committed: Mon Sep 30 11:20:05 2013 -0500
----------------------------------------------------------------------
debian/init | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea05f5ba/debian/init
----------------------------------------------------------------------
diff --git a/debian/init b/debian/init
index a9496ef..ce929a1 100644
--- a/debian/init
+++ b/debian/init
@@ -105,7 +105,7 @@ classpath()
# process is not running but the pidfile exists (to match the exit codes for
# the "status" command; see LSB core spec 3.1, section 20.2)
#
-CMD_PATT="-user.cassandra.+CassandraDaemon"
+CMD_PATT="cassandra.+CassandraDaemon"
is_running()
{
if [ -f $PIDFILE ]; then
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a36436fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a36436fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a36436fc
Branch: refs/heads/trunk
Commit: a36436fc3f3c9f71307427ec344ba2474e47a1a2
Parents: 359d566 00f6173
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 30 13:01:30 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 30 13:01:30 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a36436fc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------