You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/30 21:07:24 UTC
[1/6] git commit: Nodetool gets default JMX port from
cassandra-env.sh Patch by Sam Tunnicliffe,
reviewed by brandonwilliams for CASSANDRA-6273
Updated Branches:
refs/heads/cassandra-1.2 18f793537 -> b461c3bfa
refs/heads/cassandra-2.0 89911c82a -> 830711c72
refs/heads/trunk 58e2706d3 -> 04984ab27
Nodetool gets default JMX port from cassandra-env.sh
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6273
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b461c3bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b461c3bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b461c3bf
Branch: refs/heads/cassandra-1.2
Commit: b461c3bfad66eb4f491803bc26bc6023d043e906
Parents: 18f7935
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 30 15:05:02 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 30 15:05:02 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/nodetool | 32 +++++++++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b461c3bf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6d95cef..e2fcbb8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@
* (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214)
* Require logging in for Thrift CQL2/3 statement preparation (CASSANDRA-6254)
* restrict max_num_tokens to 1536 (CASSANDRA-6267)
+ * Nodetool gets default JMX port from cassandra-env.sh (CASSANDRA-6273)
1.2.11
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b461c3bf/bin/nodetool
----------------------------------------------------------------------
diff --git a/bin/nodetool b/bin/nodetool
index ef79f66..d4c0439 100755
--- a/bin/nodetool
+++ b/bin/nodetool
@@ -47,6 +47,36 @@ if [ -z "$CASSANDRA_CONF" -o -z "$CLASSPATH" ]; then
exit 1
fi
+# Run cassandra-env.sh to pick up JMX_PORT
+if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
+ . "$CASSANDRA_CONF/cassandra-env.sh"
+fi
+
+# JMX Port passed via cmd line args (-p 9999 / --port 9999 / --port=9999)
+# should override the value from cassandra-env.sh
+ARGS=""
+while true
+do
+ if [ ! $1 ]; then break; fi
+ case $1 in
+ -p)
+ JMX_PORT=$2
+ shift
+ ;;
+ --port=*)
+ JMX_PORT=$(echo $1 | cut -d '=' -f 2)
+ ;;
+ --port)
+ JMX_PORT=$2
+ shift
+ ;;
+ *)
+ ARGS="$ARGS $1"
+ ;;
+ esac
+ shift
+done
+
# Special-case path variables.
case "`uname`" in
CYGWIN*)
@@ -59,6 +89,6 @@ esac
-Xmx32m \
-Dlog4j.configuration=log4j-tools.properties \
-Dstorage-config="$CASSANDRA_CONF" \
- org.apache.cassandra.tools.NodeCmd ${1+"$@"}
+ org.apache.cassandra.tools.NodeCmd -p $JMX_PORT $ARGS
# vi:ai sw=4 ts=4 tw=0 et
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@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/04984ab2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04984ab2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04984ab2
Branch: refs/heads/trunk
Commit: 04984ab2751790a2b3b1d16d46fdd3cee29f1274
Parents: 58e2706 830711c
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 30 15:05:46 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 30 15:05:46 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/nodetool | 32 +++++++++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/04984ab2/CHANGES.txt
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/830711c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/830711c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/830711c7
Branch: refs/heads/trunk
Commit: 830711c72402fa1250ad5fc72ca0b8ac1c608897
Parents: 89911c8 b461c3b
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 30 15:05:36 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 30 15:05:36 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/nodetool | 32 +++++++++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/830711c7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6aad468,e2fcbb8..ecec238
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,54 -1,16 +1,55 @@@
-1.2.12
- * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
- * Fix altering column types (CASSANDRA-6185)
- * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
- * add windows bat files for shell commands (CASSANDRA-6145)
- * Fix potential stack overflow during range tombstones insertion (CASSANDRA-6181)
- * (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214)
+2.0.3
+ * Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
+ * Compact hottest sstables first and optionally omit coldest from
+ compaction entirely (CASSANDRA-6109)
+ * Fix modifying column_metadata from thrift (CASSANDRA-6182)
+ * cqlsh: fix LIST USERS output (CASSANDRA-6242)
+ * Add IRequestSink interface (CASSANDRA-6248)
+ * Update memtable size while flushing (CASSANDRA-6249)
+ * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252)
+ * Require Permission.SELECT for CAS updates (CASSANDRA-6247)
+ * New CQL-aware SSTableWriter (CASSANDRA-5894)
+ * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270)
+Merged from 1.2:
* Require logging in for Thrift CQL2/3 statement preparation (CASSANDRA-6254)
* restrict max_num_tokens to 1536 (CASSANDRA-6267)
+ * Nodetool gets default JMX port from cassandra-env.sh (CASSANDRA-6273)
-1.2.11
+2.0.2
+ * Update FailureDetector to use nanontime (CASSANDRA-4925)
+ * Fix FileCacheService regressions (CASSANDRA-6149)
+ * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
+ * Fix race conditions in bulk loader (CASSANDRA-6129)
+ * Add configurable metrics reporting (CASSANDRA-4430)
+ * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
+ * Track and persist sstable read activity (CASSANDRA-5515)
+ * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+ * Create snapshot dir if it does not exist when migrating
+ leveled manifest (CASSANDRA-6093)
+ * make sequential nodetool repair the default (CASSANDRA-5950)
+ * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
+ * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
+ * Delete can potentially be skipped in batch (CASSANDRA-6115)
+ * Allow alter keyspace on system_traces (CASSANDRA-6016)
+ * Disallow empty column names in cql (CASSANDRA-6136)
+ * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383)
+ * Save compaction history to system keyspace (CASSANDRA-5078)
+ * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166)
+ * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
+ * Add reloadtriggers command to nodetool (CASSANDRA-4949)
+ * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
+ * Fix sstable loader (CASSANDRA-6205)
+ * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
+ * Fix NPE while loading paxos state (CASSANDRA-6211)
+ * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228)
+Merged from 1.2:
+ * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
* Add a warning for small LCS sstable size (CASSANDRA-6191)
* Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191)
* Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/830711c7/bin/nodetool
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/830711c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/830711c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/830711c7
Branch: refs/heads/cassandra-2.0
Commit: 830711c72402fa1250ad5fc72ca0b8ac1c608897
Parents: 89911c8 b461c3b
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 30 15:05:36 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 30 15:05:36 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/nodetool | 32 +++++++++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/830711c7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6aad468,e2fcbb8..ecec238
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,54 -1,16 +1,55 @@@
-1.2.12
- * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
- * Fix altering column types (CASSANDRA-6185)
- * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
- * add windows bat files for shell commands (CASSANDRA-6145)
- * Fix potential stack overflow during range tombstones insertion (CASSANDRA-6181)
- * (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214)
+2.0.3
+ * Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
+ * Compact hottest sstables first and optionally omit coldest from
+ compaction entirely (CASSANDRA-6109)
+ * Fix modifying column_metadata from thrift (CASSANDRA-6182)
+ * cqlsh: fix LIST USERS output (CASSANDRA-6242)
+ * Add IRequestSink interface (CASSANDRA-6248)
+ * Update memtable size while flushing (CASSANDRA-6249)
+ * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252)
+ * Require Permission.SELECT for CAS updates (CASSANDRA-6247)
+ * New CQL-aware SSTableWriter (CASSANDRA-5894)
+ * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270)
+Merged from 1.2:
* Require logging in for Thrift CQL2/3 statement preparation (CASSANDRA-6254)
* restrict max_num_tokens to 1536 (CASSANDRA-6267)
+ * Nodetool gets default JMX port from cassandra-env.sh (CASSANDRA-6273)
-1.2.11
+2.0.2
+ * Update FailureDetector to use nanontime (CASSANDRA-4925)
+ * Fix FileCacheService regressions (CASSANDRA-6149)
+ * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
+ * Fix race conditions in bulk loader (CASSANDRA-6129)
+ * Add configurable metrics reporting (CASSANDRA-4430)
+ * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
+ * Track and persist sstable read activity (CASSANDRA-5515)
+ * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+ * Create snapshot dir if it does not exist when migrating
+ leveled manifest (CASSANDRA-6093)
+ * make sequential nodetool repair the default (CASSANDRA-5950)
+ * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
+ * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
+ * Delete can potentially be skipped in batch (CASSANDRA-6115)
+ * Allow alter keyspace on system_traces (CASSANDRA-6016)
+ * Disallow empty column names in cql (CASSANDRA-6136)
+ * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383)
+ * Save compaction history to system keyspace (CASSANDRA-5078)
+ * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166)
+ * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
+ * Add reloadtriggers command to nodetool (CASSANDRA-4949)
+ * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
+ * Fix sstable loader (CASSANDRA-6205)
+ * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
+ * Fix NPE while loading paxos state (CASSANDRA-6211)
+ * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228)
+Merged from 1.2:
+ * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
* Add a warning for small LCS sstable size (CASSANDRA-6191)
* Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191)
* Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/830711c7/bin/nodetool
----------------------------------------------------------------------
[3/6] git commit: Nodetool gets default JMX port from
cassandra-env.sh Patch by Sam Tunnicliffe,
reviewed by brandonwilliams for CASSANDRA-6273
Posted by br...@apache.org.
Nodetool gets default JMX port from cassandra-env.sh
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6273
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b461c3bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b461c3bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b461c3bf
Branch: refs/heads/trunk
Commit: b461c3bfad66eb4f491803bc26bc6023d043e906
Parents: 18f7935
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 30 15:05:02 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 30 15:05:02 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/nodetool | 32 +++++++++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b461c3bf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6d95cef..e2fcbb8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@
* (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214)
* Require logging in for Thrift CQL2/3 statement preparation (CASSANDRA-6254)
* restrict max_num_tokens to 1536 (CASSANDRA-6267)
+ * Nodetool gets default JMX port from cassandra-env.sh (CASSANDRA-6273)
1.2.11
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b461c3bf/bin/nodetool
----------------------------------------------------------------------
diff --git a/bin/nodetool b/bin/nodetool
index ef79f66..d4c0439 100755
--- a/bin/nodetool
+++ b/bin/nodetool
@@ -47,6 +47,36 @@ if [ -z "$CASSANDRA_CONF" -o -z "$CLASSPATH" ]; then
exit 1
fi
+# Run cassandra-env.sh to pick up JMX_PORT
+if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
+ . "$CASSANDRA_CONF/cassandra-env.sh"
+fi
+
+# JMX Port passed via cmd line args (-p 9999 / --port 9999 / --port=9999)
+# should override the value from cassandra-env.sh
+ARGS=""
+while true
+do
+ if [ ! $1 ]; then break; fi
+ case $1 in
+ -p)
+ JMX_PORT=$2
+ shift
+ ;;
+ --port=*)
+ JMX_PORT=$(echo $1 | cut -d '=' -f 2)
+ ;;
+ --port)
+ JMX_PORT=$2
+ shift
+ ;;
+ *)
+ ARGS="$ARGS $1"
+ ;;
+ esac
+ shift
+done
+
# Special-case path variables.
case "`uname`" in
CYGWIN*)
@@ -59,6 +89,6 @@ esac
-Xmx32m \
-Dlog4j.configuration=log4j-tools.properties \
-Dstorage-config="$CASSANDRA_CONF" \
- org.apache.cassandra.tools.NodeCmd ${1+"$@"}
+ org.apache.cassandra.tools.NodeCmd -p $JMX_PORT $ARGS
# vi:ai sw=4 ts=4 tw=0 et
[2/6] git commit: Nodetool gets default JMX port from
cassandra-env.sh Patch by Sam Tunnicliffe,
reviewed by brandonwilliams for CASSANDRA-6273
Posted by br...@apache.org.
Nodetool gets default JMX port from cassandra-env.sh
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6273
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b461c3bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b461c3bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b461c3bf
Branch: refs/heads/cassandra-2.0
Commit: b461c3bfad66eb4f491803bc26bc6023d043e906
Parents: 18f7935
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 30 15:05:02 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 30 15:05:02 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/nodetool | 32 +++++++++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b461c3bf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6d95cef..e2fcbb8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@
* (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214)
* Require logging in for Thrift CQL2/3 statement preparation (CASSANDRA-6254)
* restrict max_num_tokens to 1536 (CASSANDRA-6267)
+ * Nodetool gets default JMX port from cassandra-env.sh (CASSANDRA-6273)
1.2.11
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b461c3bf/bin/nodetool
----------------------------------------------------------------------
diff --git a/bin/nodetool b/bin/nodetool
index ef79f66..d4c0439 100755
--- a/bin/nodetool
+++ b/bin/nodetool
@@ -47,6 +47,36 @@ if [ -z "$CASSANDRA_CONF" -o -z "$CLASSPATH" ]; then
exit 1
fi
+# Run cassandra-env.sh to pick up JMX_PORT
+if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
+ . "$CASSANDRA_CONF/cassandra-env.sh"
+fi
+
+# JMX Port passed via cmd line args (-p 9999 / --port 9999 / --port=9999)
+# should override the value from cassandra-env.sh
+ARGS=""
+while true
+do
+ if [ ! $1 ]; then break; fi
+ case $1 in
+ -p)
+ JMX_PORT=$2
+ shift
+ ;;
+ --port=*)
+ JMX_PORT=$(echo $1 | cut -d '=' -f 2)
+ ;;
+ --port)
+ JMX_PORT=$2
+ shift
+ ;;
+ *)
+ ARGS="$ARGS $1"
+ ;;
+ esac
+ shift
+done
+
# Special-case path variables.
case "`uname`" in
CYGWIN*)
@@ -59,6 +89,6 @@ esac
-Xmx32m \
-Dlog4j.configuration=log4j-tools.properties \
-Dstorage-config="$CASSANDRA_CONF" \
- org.apache.cassandra.tools.NodeCmd ${1+"$@"}
+ org.apache.cassandra.tools.NodeCmd -p $JMX_PORT $ARGS
# vi:ai sw=4 ts=4 tw=0 et