You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/10/08 00:23:07 UTC
[1/3] git commit: Schedule fat client schema pull on join
Repository: cassandra
Updated Branches:
refs/heads/trunk 36edbda64 -> 2e8ba0364
Schedule fat client schema pull on join
patch by Oleg Anastasyev; reviewed by Aleksey Yeschenko for
CASSANDRA-7993
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87cbcc0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87cbcc0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87cbcc0f
Branch: refs/heads/trunk
Commit: 87cbcc0fc1d0fc0375332d77b252f4e0d7b95f80
Parents: e70f4f8
Author: Oleg Anastasyev <ol...@gmail.com>
Authored: Wed Oct 8 01:20:44 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Oct 8 01:20:44 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/87cbcc0f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 188f951..1bef399 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.11:
+ * Schedule fat client schema pull on join (CASSANDRA-7993)
* Don't reset nodes' versions when closing IncomingTcpConnections
(CASSANDRA-7734)
* Record the real messaging version in all cases in OutboundTcpConnection
http://git-wip-us.apache.org/repos/asf/cassandra/blob/87cbcc0f/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 43bc198..0cd4be5 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1970,6 +1970,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public void onAlive(InetAddress endpoint, EndpointState state)
{
+ MigrationManager.instance.scheduleSchemaPull(endpoint, state);
+
if (isClientMode)
return;
@@ -1984,7 +1986,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
subscriber.onJoinCluster(endpoint);
}
- MigrationManager.instance.scheduleSchemaPull(endpoint, state);
}
public void onRemove(InetAddress endpoint)
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed1681a4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed1681a4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed1681a4
Branch: refs/heads/trunk
Commit: ed1681a473be37e77aef351eaa0c57250a5a671d
Parents: ba50db4 87cbcc0
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Oct 8 01:22:40 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Oct 8 01:22:40 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed1681a4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 824fae6,1bef399..0595767
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,67 -1,5 +1,68 @@@
-2.0.11:
+2.1.1
+ * Fix some Thrift slice deletions and updates of COMPACT STORAGE
+ tables with some clustering columns omitted (CASSANDRA-7990)
+ * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
+ * Properly track added size (CASSANDRA-7239)
+ * Allow compilation in java 8 (CASSANDRA-7208)
+ * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
+ * Release references to overlapping sstables during compaction (CASSANDRA-7819)
+ * Send notification when opening compaction results early (CASSANDRA-8034)
+ * Make native server start block until properly bound (CASSANDRA-7885)
+ * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
+ * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
+ * Make sstablerepairedset take a list of files (CASSANDRA-7995)
+ * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
+ * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
+ * Fix resource leak in event of corrupt sstable
+ * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
+ * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930)
+ * Invalidate prepared statements when their keyspace or table is
+ dropped (CASSANDRA-7566)
+ * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
+ * Fix saving caches when a table is dropped (CASSANDRA-7784)
+ * Add better error checking of new stress profile (CASSANDRA-7716)
+ * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom (CASSANDRA-7934)
+ * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
+ * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
+ * GCInspector more closely tracks GC; cassandra-stress and nodetool report it (CASSANDRA-7916)
+ * nodetool won't output bogus ownership info without a keyspace (CASSANDRA-7173)
+ * Add human readable option to nodetool commands (CASSANDRA-5433)
+ * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
+ * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
+ * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
+ * (cqlsh) Support for query paging (CASSANDRA-7514)
+ * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
+ * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
+ * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
+ * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
+ * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
+ * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
+ * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
+ output (CASSANDRA-7659)
+ * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
+ * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
+ * Support list index operations with conditions (CASSANDRA-7499)
+ * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * 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)
+ * Make repair -pr work with -local (CASSANDRA-7450)
+ * Fix error in sstableloader with -cph > 1 (CASSANDRA-8007)
+ * Fix snapshot repair error on indexed tables (CASSANDRA-8020)
+ * Do not exit nodetool repair when receiving JMX NOTIF_LOST (CASSANDRA-7909)
+Merged from 2.0:
+ * Schedule fat client schema pull on join (CASSANDRA-7993)
* Don't reset nodes' versions when closing IncomingTcpConnections
(CASSANDRA-7734)
* Record the real messaging version in all cases in OutboundTcpConnection
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed1681a4/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e8ba036
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e8ba036
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e8ba036
Branch: refs/heads/trunk
Commit: 2e8ba0364d6dba78d4dbc7253571180217be6cc8
Parents: 36edbda ed1681a
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Oct 8 01:22:56 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Oct 8 01:22:56 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e8ba036/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e8ba036/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------