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/03/14 21:27:57 UTC
[5/7] 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/3595131d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3595131d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3595131d
Branch: refs/heads/trunk
Commit: 3595131df61e7d28c22e6be60a742b6deb69cba6
Parents: fcd9a37 3050134
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Mar 14 15:27:19 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Mar 14 15:27:19 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
.../cassandra/db/commitlog/CommitLogSegment.java | 1 -
src/java/org/apache/cassandra/gms/Gossiper.java | 18 ++++++++++++++++++
.../apache/cassandra/service/StorageProxy.java | 8 ++++----
4 files changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3595131d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a532bdc,045e4f8..9575c8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,7 +1,32 @@@
-2.0.7
+2.1.0-beta2
+ * Eliminate possibility of CL segment appearing twice in active list
+ (CASSANDRA-6557)
+ * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
+ * Switch CRC component to Adler and include it for compressed sstables
+ (CASSANDRA-4165)
+ * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
+ * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
+ * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
+ * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
+ * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
+ * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
+ * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
+ * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
+ * Scrub should not always clear out repaired status (CASSANDRA-5351)
+ * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
+ * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
+ * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
+ * Change caching option syntax (CASSANDRA-6745)
+ * Fix stress to do proper counter reads (CASSANDRA-6835)
+ * Fix help message for stress counter_write (CASSANDRA-6824)
+ * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848)
+ * Add logging levels (minimal, normal or verbose) to stress tool (CASSANDRA-6849)
+ * Fix race condition in Batch CLE (CASSANDRA-6860)
-
+Merged from 2.0:
+ * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864)
* Fix schema concurrency exceptions (CASSANDRA-6841)
* Fix leaking validator FH in StreamWriter (CASSANDRA-6832)
+ * fix nodetool getsstables for blob PK (CASSANDRA-6803)
* Fix saving triggers to schema (CASSANDRA-6789)
* Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
* Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3595131d/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 04568d3,5b8bcfa..cabd886
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@@ -26,9 -28,7 +26,8 @@@ import java.nio.channels.FileChannel
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
--import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3595131d/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3595131d/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index c78d020,a5542e6..64e06fe
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -1945,18 -1860,14 +1945,18 @@@ public class StorageProxy implements St
* Asks the gossiper if there are any nodes that are currently down.
* @return true if the gossiper thinks all nodes are up.
*/
- private static boolean isAnyHostDown()
+ private static boolean isAnyStorageHostDown()
{
- return !Gossiper.instance.getUnreachableMembers().isEmpty();
+ return !Gossiper.instance.getUnreachableTokenOwners().isEmpty();
}
-
+
public interface WritePerformer
{
- public void apply(IMutation mutation, Iterable<InetAddress> targets, AbstractWriteResponseHandler responseHandler, String localDataCenter, ConsistencyLevel consistency_level) throws OverloadedException;
+ public void apply(IMutation mutation,
+ Iterable<InetAddress> targets,
+ AbstractWriteResponseHandler responseHandler,
+ String localDataCenter,
+ ConsistencyLevel consistencyLevel) throws OverloadedException;
}
/**