You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/01/18 00:14:02 UTC
[1/5] git commit: Add example jmx auth file location Patch by Peter
Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Updated Branches:
refs/heads/trunk f64283569 -> 4e9d1aca0
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b78617b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b78617b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b78617b2
Branch: refs/heads/trunk
Commit: b78617b22671d7e117826b31bcc044dc8d5b8ced
Parents: b0b168f
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 17 11:06:13 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 17 11:07:12 2014 -0600
----------------------------------------------------------------------
conf/cassandra-env.sh | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b78617b2/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index b5aea38..dce8ca4 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -226,21 +226,22 @@ fi
# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414
# JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414"
-# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See
+# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See
# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 (short version:
# comment out this entry to enable IPv6 support).
JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true"
# jmx: metrics and administration interface
-#
+#
# add this if you're having trouble connecting:
# JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>"
-#
-# see
+#
+# see
# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_in_jconsole
# for more on configuring JMX through firewalls, etc. (Short version:
# get it working with no firewall first.)
-JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT"
-JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false"
-JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false"
+JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT"
+JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false"
+JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false"
+#JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.password.file=/etc/cassandra/jmxremote.password"
JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS"
[4/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by ja...@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/24af3525
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24af3525
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24af3525
Branch: refs/heads/trunk
Commit: 24af3525f2f036ba116941cee94a56f1d0e46e07
Parents: 886ac6a 3de8454
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Jan 17 15:12:22 2014 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Fri Jan 17 15:12:22 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/24af3525/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 80bc626,0b49665..d165c8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -16,29 -12,10 +16,30 @@@ Merged from 1.2
* Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
* Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
* Paginate batchlog replay (CASSANDRA-6569)
+ * skip blocking on streaming during drain (CASSANDRA-6603)
-1.2.13
+2.0.4
+ * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
+ * add StorageService.stopDaemon() (CASSANDRA-4268)
+ * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
+ * add client encryption support to sstableloader (CASSANDRA-6378)
+ * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
+ * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
+ * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
+ * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
+ * Fix cleanup ClassCastException (CASSANDRA-6462)
+ * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
+ * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
+ * Fix divide-by-zero in PCI (CASSANDRA-6403)
+ * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
+ * Expose a total memtable size metric for a CF (CASSANDRA-6391)
+ * cqlsh: handle symlinks properly (CASSANDRA-6425)
+ * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
+ * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
+ * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
+Merged from 1.2:
* Improved error message on bad properties in DDL queries (CASSANDRA-6453)
* Randomize batchlog candidates selection (CASSANDRA-6481)
* Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)
[2/5] git commit: Add example jmx auth file location Patch by Peter
Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Posted by ja...@apache.org.
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/886ac6ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/886ac6ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/886ac6ad
Branch: refs/heads/trunk
Commit: 886ac6adc08baa1b9c2d92b9d1df4e92fbca244a
Parents: 8814623
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 17 11:06:13 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 17 11:07:22 2014 -0600
----------------------------------------------------------------------
conf/cassandra-env.sh | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/886ac6ad/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 95acc4e..78a39f4 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -236,21 +236,22 @@ fi
# uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414
# JVM_OPTS="$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414"
-# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See
+# Prefer binding to IPv4 network intefaces (when net.ipv6.bindv6only=1). See
# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 (short version:
# comment out this entry to enable IPv6 support).
JVM_OPTS="$JVM_OPTS -Djava.net.preferIPv4Stack=true"
# jmx: metrics and administration interface
-#
+#
# add this if you're having trouble connecting:
# JVM_OPTS="$JVM_OPTS -Djava.rmi.server.hostname=<public name>"
-#
-# see
+#
+# see
# https://blogs.oracle.com/jmxetc/entry/troubleshooting_connection_problems_in_jconsole
# for more on configuring JMX through firewalls, etc. (Short version:
# get it working with no firewall first.)
-JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT"
-JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false"
-JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false"
+JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT"
+JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false"
+JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false"
+#JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.password.file=/etc/cassandra/jmxremote.password"
JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS"
[5/5] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by ja...@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/4e9d1aca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e9d1aca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e9d1aca
Branch: refs/heads/trunk
Commit: 4e9d1aca0449e68b6e2a31ffac0a7b384915d22c
Parents: f642835 24af352
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Jan 17 15:13:48 2014 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Fri Jan 17 15:13:48 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e9d1aca/CHANGES.txt
----------------------------------------------------------------------
[3/5] git commit: skip blocking on streaming during drain patch by
jasobrown; reviewed by yukim for CASSANDRA-6603
Posted by ja...@apache.org.
skip blocking on streaming during drain
patch by jasobrown; reviewed by yukim for CASSANDRA-6603
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3de84542
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3de84542
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3de84542
Branch: refs/heads/trunk
Commit: 3de845426aebaba733d616f7e6426b2a6c410a3e
Parents: b78617b
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Jan 17 13:33:08 2014 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Fri Jan 17 15:10:26 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/MessagingService.java | 14 --------------
.../org/apache/cassandra/service/StorageService.java | 2 --
3 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3de84542/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f550863..0b49665 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
* Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
* Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
* Paginate batchlog replay (CASSANDRA-6569)
+ * skip blocking on streaming during drain (CASSANDRA-6603)
1.2.13
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3de84542/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index 7e420cf..3ec3267 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -672,20 +672,6 @@ public final class MessagingService implements MessagingServiceMBean
callbacks.reset();
}
- public void waitForStreaming() throws InterruptedException
- {
- // this does not prevent new streams from beginning after a drain begins, but since streams are only
- // started in response to explicit operator action (bootstrap/move/repair/etc) that feels like a feature.
- for (DebuggableThreadPoolExecutor e : streamExecutors.values())
- e.shutdown();
-
- for (DebuggableThreadPoolExecutor e : streamExecutors.values())
- {
- if (!e.awaitTermination(24, TimeUnit.HOURS))
- logger.error("Stream took more than 24H to complete; skipping");
- }
- }
-
/**
* Wait for callbacks and don't allow any more to be created (since they could require writing hints)
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3de84542/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 90089ab..8491cb0 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3403,8 +3403,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
setMode(Mode.DRAINING, "shutting down MessageService", false);
MessagingService.instance().shutdown();
- setMode(Mode.DRAINING, "waiting for streaming", false);
- MessagingService.instance().waitForStreaming();
setMode(Mode.DRAINING, "clearing mutation stage", false);
mutationStage.shutdown();