[4/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/2e7b0884
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e7b0884
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e7b0884
Branch: refs/heads/trunk
Commit: 2e7b0884a2d2324642eca99707a3f25fef77362f
Parents: ed0026f a7cae32
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue May 12 10:56:43 2015 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue May 12 10:56:43 2015 -0500
--
CHANGES.txt | 1 +
.../cassandra/locator/ReconnectableSnitchHelper.java | 1 -
.../apache/cassandra/net/IncomingTcpConnection.java | 14 --
3 files changed, 5 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e7b0884/CHANGES.txt
--
diff --cc CHANGES.txt
index 6e586a3,685b945..aa5f235
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
-2.0.15:
+2.1.6
+ * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
+ * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
+ * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
+ * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
+ * Validate the indexed column rather than the cell's contents for 2i
(CASSANDRA-9057)
+ * Add support for top-k custom 2i queries (CASSANDRA-8717)
+ * Fix error when dropping table during compaction (CASSANDRA-9251)
+ * cassandra-stress supports validation operations over user profiles
(CASSANDRA-8773)
+ * Add support for rate limiting log messages (CASSANDRA-9029)
+ * Log the partition key with tombstone warnings (CASSANDRA-8561)
+ * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
+ * Fix PITR commitlog replay (CASSANDRA-9195)
+ * GCInspector logs very different times (CASSANDRA-9124)
+ * Fix deleting from an empty list (CASSANDRA-9198)
+ * Update tuple and collection types that use a user-defined type when that
UDT
+ is modified (CASSANDRA-9148, CASSANDRA-9192)
+ * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
+ * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
+ * Repair waits for anticompaction to finish (CASSANDRA-9097)
+Merged from 2.0:
+ * Fix ReconnectableSnitch reconnecting to peers during upgrade
(CASSANDRA-6702)
* Include keyspace and table name in error log for collections over the size
limit (CASSANDRA-9286)
* Avoid potential overlap in LCS with single-partition sstables
(CASSANDRA-9322)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e7b0884/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
--
diff --cc src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 08baf89,4817c75..2456050
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@@ -158,18 -139,9 +161,9 @@@ public class IncomingTcpConnection exte
}
else
{
-in = new DataInputStream(new
BufferedInputStream(socket.getInputStream(), 4096));
+in = new DataInputStream(new
BufferedInputStream(socket.getInputStream(), BUFFER_SIZE));
}
- if (version MessagingService.current_version)
- {
- // save the endpoint so gossip will reconnect to it
- Gossiper.instance.addSavedEndpoint(from);
- logger.info(Received messages from newer protocol version {}.
Ignoring, version);
- return;
- }
- // outbound side will reconnect if necessary to upgrade version
-
while (true)
{
MessagingService.validateMagic(in.readInt());
[4/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/27c67ad8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27c67ad8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27c67ad8 Branch: refs/heads/trunk Commit: 27c67ad851651cb49c9d1cae7d478b831e372aaf Parents: 29259cb 5784309 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Dec 10 15:19:48 2014 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Dec 10 15:19:48 2014 -0600 -- CHANGES.txt| 1 + .../db/compaction/DateTieredCompactionStrategyOptions.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27c67ad8/CHANGES.txt -- diff --cc CHANGES.txt index 2e74a15,385af01..25e0f47 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -2.0.12: +2.1.3 + * Remove tmplink files for offline compactions (CASSANDRA-8321) + * Reduce maxHintsInProgress (CASSANDRA-8415) + * BTree updates may call provided update function twice (CASSANDRA-8018) + * 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: + * Default DTCS base_time_seconds changed to 60 (CASSANDRA-8417) * Refuse Paxos operation with more than one pending endpoint (CASSANDRA-8346) * Throw correct exception when trying to bind a keyspace or table name (CASSANDRA-6952)
[4/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/trunk
Commit: 587657d372c8d1ba71d03a4e6c0c765be915d3bc
Parents: d15c918 4030088
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 2 16:07:18 2014 -0600
Committer: Jonathan Ellis jbel...@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();
