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 2014/12/02 23:07:35 UTC
[5/6] cassandra git commit: merge from 2.0
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/587657d3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/587657d3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/587657d3
Branch: refs/heads/cassandra-2.1
Commit: 587657d372c8d1ba71d03a4e6c0c765be915d3bc
Parents: d15c918 4030088
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Dec 2 16:07:18 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Dec 2 16:07:18 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/587657d3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7df396d,dc3896d..041c1e1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,6 +1,23 @@@
-2.0.12:
+2.1.3
+ * Release sstable references after anticompaction (CASSANDRA-8386)
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+Merged from 2.0:
+ * cancel latency-sampling task when CF is dropped (CASSANDRA-8401)
+ * don't block SocketThread for MessagingService (CASSANDRA-8188)
* Increase quarantine delay on replacement (CASSANDRA-8260)
* Expose off-heap memory usage stats (CASSANDRA-7897)
* Ignore Paxos commits for truncated tables (CASSANDRA-7538)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/587657d3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 1bd5f2a,6cdf9e9..0507973
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -135,13 -107,8 +135,14 @@@ public class ColumnFamilyStore implemen
public final ColumnFamilyMetrics metric;
public volatile long sampleLatencyNanos;
+ private final ScheduledFuture<?> latencyCalculator;
+ public static void shutdownPostFlushExecutor() throws InterruptedException
+ {
+ postFlushExecutor.shutdown();
+ postFlushExecutor.awaitTermination(60, TimeUnit.SECONDS);
+ }
+
public void reload()
{
// metadata object has been mutated directly. make all the members jibe with new settings.
@@@ -318,7 -293,7 +319,7 @@@
throw new RuntimeException(e);
}
logger.debug("retryPolicy for {} is {}", name, this.metadata.getSpeculativeRetry());
- ScheduledExecutors.optionalTasks.scheduleWithFixedDelay(new Runnable()
- latencyCalculator = StorageService.optionalTasks.scheduleWithFixedDelay(new Runnable()
++ latencyCalculator = ScheduledExecutors.optionalTasks.scheduleWithFixedDelay(new Runnable()
{
public void run()
{
@@@ -353,13 -328,12 +354,13 @@@
}
catch (Exception e)
{
+ JVMStabilityInspector.inspectThrowable(e);
// this shouldn't block anything.
- logger.warn("Failed unregistering mbean: " + mbeanName, e);
+ logger.warn("Failed unregistering mbean: {}", mbeanName, e);
}
+ latencyCalculator.cancel(false);
- compactionStrategy.shutdown();
+ compactionStrategyWrapper.shutdown();
-
SystemKeyspace.removeTruncationRecord(metadata.cfId);
data.unreferenceSSTables();
indexManager.invalidate();