cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [4/6] git commit: merge from 2.1.0
Date Sat, 02 Aug 2014 02:03:35 GMT
merge from 2.1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d33e29ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d33e29ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d33e29ac

Branch: refs/heads/trunk
Commit: d33e29accf8e9372bc9355918c0a6c3c89d1f30b
Parents: 40a21c0 41a85af
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Aug 1 21:03:15 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Aug 1 21:03:15 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 conf/cassandra-env.sh                           |   7 +-
 .../cassandra/service/CassandraDaemon.java      |   2 +-
 .../apache/cassandra/service/GCInspector.java   | 145 ++++++-------------
 4 files changed, 53 insertions(+), 102 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d33e29ac/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e7e2304,f4b3921..c39490a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 +2.1.1
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
 +
 +
  2.1.0-final
+  * Switch to notification-based GCInspector (CASSANDRA-7638)
   * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
   * Don't use strict consistency when replacing (CASSANDRA-7568)
   * Fix min/max cell name collection on 2.0 SSTables with range

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d33e29ac/conf/cassandra-env.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d33e29ac/src/java/org/apache/cassandra/service/GCInspector.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/GCInspector.java
index f03ec01,c766dc0..d04b250
--- a/src/java/org/apache/cassandra/service/GCInspector.java
+++ b/src/java/org/apache/cassandra/service/GCInspector.java
@@@ -17,21 -17,22 +17,21 @@@
   */
  package org.apache.cassandra.service;
  
- import java.lang.management.GarbageCollectorMXBean;
  import java.lang.management.ManagementFactory;
- import java.lang.management.MemoryMXBean;
  import java.lang.management.MemoryUsage;
- import java.lang.reflect.UndeclaredThrowableException;
  import java.util.ArrayList;
- import java.util.HashMap;
+ import java.util.Collections;
  import java.util.List;
- import java.util.concurrent.TimeUnit;
 -import java.util.Map;
  import javax.management.MBeanServer;
+ import javax.management.Notification;
+ import javax.management.NotificationListener;
  import javax.management.ObjectName;
+ import javax.management.openmbean.CompositeData;
  
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
++import com.sun.management.GarbageCollectionNotificationInfo;
  import org.apache.cassandra.io.sstable.SSTableDeletingTask;
  import org.apache.cassandra.utils.StatusLogger;
  


Mime
View raw message