You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2010/12/14 23:43:48 UTC
svn commit: r1049314 - in /cassandra: branches/cassandra-0.7/src/java/org/apache/cassandra/db/migration/ branches/cassandra-0.7/src/java/org/apache/cassandra/service/ trunk/src/java/org/apache/cassandra/db/migration/ trunk/src/java/org/apache/cassandra...

Author: brandonwilliams
Date: Tue Dec 14 22:43:48 2010
New Revision: 1049314

URL: http://svn.apache.org/viewvc?rev=1049314&view=rev
Log:
Always put schema state in local gossip.  Patch by gdusbabek, reviewed by brandonwilliams for CASSANDRA-1824

Modified:
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/migration/Migration.java
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/MigrationManager.java
    cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java
    cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/migration/Migration.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/migration/Migration.java?rev=1049314&r1=1049313&r2=1049314&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/migration/Migration.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/migration/Migration.java Tue Dec 14 22:43:48 2010
@@ -178,8 +178,6 @@ public abstract class Migration
         
         // immediate notification for esiting nodes.
         MigrationManager.announce(newVersion, Gossiper.instance.getLiveMembers());
-        // this is for notifying nodes as they arrive in the cluster.
-        Gossiper.instance.addLocalApplicationState(ApplicationState.SCHEMA, StorageService.valueFactory.migration(newVersion));
     }
     
     public static UUID getLastMigrationId()

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/MigrationManager.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/MigrationManager.java?rev=1049314&r1=1049313&r2=1049314&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/MigrationManager.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/MigrationManager.java Tue Dec 14 22:43:48 2010
@@ -26,6 +26,7 @@ import org.apache.cassandra.db.Column;
 import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.migration.Migration;
 import org.apache.cassandra.gms.ApplicationState;
+import org.apache.cassandra.gms.Gossiper;
 import org.apache.cassandra.gms.VersionedValue;
 import org.apache.cassandra.gms.EndpointState;
 import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
@@ -106,6 +107,8 @@ public class MigrationManager implements
         Message msg = makeVersionMessage(version);
         for (InetAddress host : hosts)
             MessagingService.instance.sendOneWay(msg, host);
+        // this is for notifying nodes as they arrive in the cluster.
+        Gossiper.instance.addLocalApplicationState(ApplicationState.SCHEMA, StorageService.valueFactory.migration(version));
     }
 
     /**

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java?rev=1049314&r1=1049313&r2=1049314&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java Tue Dec 14 22:43:48 2010
@@ -178,8 +178,6 @@ public abstract class Migration
         
         // immediate notification for esiting nodes.
         MigrationManager.announce(newVersion, Gossiper.instance.getLiveMembers());
-        // this is for notifying nodes as they arrive in the cluster.
-        Gossiper.instance.addLocalApplicationState(ApplicationState.SCHEMA, StorageService.valueFactory.migration(newVersion));
     }
     
     public static UUID getLastMigrationId()

Modified: cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java?rev=1049314&r1=1049313&r2=1049314&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java Tue Dec 14 22:43:48 2010
@@ -26,6 +26,7 @@ import org.apache.cassandra.db.Column;
 import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.migration.Migration;
 import org.apache.cassandra.gms.ApplicationState;
+import org.apache.cassandra.gms.Gossiper;
 import org.apache.cassandra.gms.VersionedValue;
 import org.apache.cassandra.gms.EndpointState;
 import org.apache.cassandra.gms.IEndpointStateChangeSubscriber;
@@ -106,6 +107,8 @@ public class MigrationManager implements
         Message msg = makeVersionMessage(version);
         for (InetAddress host : hosts)
             MessagingService.instance.sendOneWay(msg, host);
+        // this is for notifying nodes as they arrive in the cluster.
+        Gossiper.instance.addLocalApplicationState(ApplicationState.SCHEMA, StorageService.valueFactory.migration(version));
     }
 
     /**