natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

push migrations when SS.loadSchemaFromYaml is called. patch by gdusbabek, reviewed by jbellis. CASSANDRA-1321 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@979734 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Dusbabek 2010-07-27 14:50:10 +00:00
parent 529aa2ebd8
commit dd5cebce85
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java
View File

@ -60,8 +60,10 @@ public class DefinitionsUpdateResponseVerbHandler implements IVerbHandler
protected void runMayThrow() throws Exception protected void runMayThrow() throws Exception
{ {
// check to make sure the current version is before this one. // check to make sure the current version is before this one.
if (DatabaseDescriptor.getDefsVersion().timestamp() >= version.timestamp()) if (DatabaseDescriptor.getDefsVersion().timestamp() == version.timestamp())
logger.debug("Not applying " + version.toString()); logger.debug("Not appling (equal) " + version.toString());
else if (DatabaseDescriptor.getDefsVersion().timestamp() > version.timestamp())
logger.debug("Not applying (before)" + version.toString());
else else
{ {
logger.debug("Applying {} from {}", m.getClass().getSimpleName(), message.getFrom()); logger.debug("Applying {} from {}", m.getClass().getSimpleName(), message.getFrom());

16
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -31,7 +31,6 @@ import javax.management.ObjectName;
import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.ColumnDefinition;
import org.apache.cassandra.config.Config;
import org.apache.cassandra.config.RawColumnDefinition; import org.apache.cassandra.config.RawColumnDefinition;
import org.apache.cassandra.config.RawColumnFamily; import org.apache.cassandra.config.RawColumnFamily;
import org.apache.cassandra.config.RawKeyspace; import org.apache.cassandra.config.RawKeyspace;
@ -77,10 +76,7 @@ import org.apache.log4j.Level;
import org.yaml.snakeyaml.Dumper; import org.yaml.snakeyaml.Dumper;
import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.introspector.Property;
import org.yaml.snakeyaml.nodes.NodeTuple;
import org.yaml.snakeyaml.nodes.Tag; import org.yaml.snakeyaml.nodes.Tag;
import org.yaml.snakeyaml.representer.Representer;
/* /*
* This abstraction contains the token/identifier of this node * This abstraction contains the token/identifier of this node
@ -1667,8 +1663,13 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
// blow up if there is a schema saved. // blow up if there is a schema saved.
if (DatabaseDescriptor.getDefsVersion().timestamp() > 0 || Migration.getLastMigrationId() != null) if (DatabaseDescriptor.getDefsVersion().timestamp() > 0 || Migration.getLastMigrationId() != null)
throw new ConfigurationException("Cannot load from XML on top of pre-existing schemas."); throw new ConfigurationException("Cannot load from XML on top of pre-existing schemas.");
Migration migration = null;
for (KSMetaData table : DatabaseDescriptor.readTablesFromYaml()) for (KSMetaData table : DatabaseDescriptor.readTablesFromYaml())
new AddKeyspace(table).apply(); {
migration = new AddKeyspace(table);
migration.apply();
}
assert DatabaseDescriptor.getDefsVersion().timestamp() > 0; assert DatabaseDescriptor.getDefsVersion().timestamp() > 0;
DefsTable.dumpToStorage(DatabaseDescriptor.getDefsVersion()); DefsTable.dumpToStorage(DatabaseDescriptor.getDefsVersion());
@ -1689,6 +1690,11 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
} }
} }
// we don't want to announce after every Migration.apply(). keep track of the last one and then announce the
// current version.
if (migration != null)
migration.announce();
} }
public String exportSchema() throws IOException public String exportSchema() throws IOException