cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdusba...@apache.org
Subject svn commit: r985306 - in /cassandra/trunk/src/java/org/apache/cassandra: db/DefinitionsUpdateResponseVerbHandler.java service/MigrationManager.java
Date Fri, 13 Aug 2010 17:57:59 GMT
Author: gdusbabek
Date: Fri Aug 13 17:57:59 2010
New Revision: 985306

URL: http://svn.apache.org/viewvc?rev=985306&view=rev
Log:
revert last change (committed wrong branch CASSANDRA-1384)

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java
    cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java?rev=985306&r1=985305&r2=985306&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java
Fri Aug 13 17:57:59 2010
@@ -19,7 +19,6 @@
 package org.apache.cassandra.db;
 
 import org.apache.cassandra.concurrent.StageManager;
-import org.apache.cassandra.config.ConfigurationException;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.migration.Migration;
 import org.apache.cassandra.net.IVerbHandler;
@@ -68,14 +67,7 @@ public class DefinitionsUpdateResponseVe
                             else
                             {
                                 logger.debug("Applying {} from {}", m.getClass().getSimpleName(),
message.getFrom());
-                                try
-                                {
-                                    m.apply();
-                                }
-                                catch (ConfigurationException ex)
-                                {
-                                    logger.info("Migration not applied " + ex.getMessage());
-                                }
+                                m.apply();
                                 m.announce();
                             }
                         }

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=985306&r1=985305&r2=985306&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java Fri Aug 13
17:57:59 2010
@@ -111,7 +111,7 @@ public class MigrationManager implements
      * This method silently eats IOExceptions thrown by Migration.apply() as a result of
applying a migration out of
      * order.
      */
-    public static void applyMigrations(final UUID from, final UUID to) throws IOException
+    public static void applyMigrations(UUID from, UUID to) throws IOException
     {
         List<Future> updates = new ArrayList<Future>();
         Collection<IColumn> migrations = Migration.getLocalMigrations(from, to);
@@ -129,7 +129,6 @@ public class MigrationManager implements
                     catch (ConfigurationException ex)
                     {
                         // this happens if we try to apply something that's already been
applied. ignore and proceed.
-                        logger.debug("Migration not applied " + ex.getMessage());
                     }
                     catch (IOException ex)
                     {



Mime
View raw message