Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05b2ae84
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05b2ae84
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05b2ae84
Branch: refs/heads/cassandra-2.0
Commit: 05b2ae84c07f906d0e66cb0718b165381c9898aa
Parents: 133cfd3 a4d7e22
Author: Brandon Williams <[email protected]>
Authored: Wed Apr 2 16:45:54 2014 -0500
Committer: Brandon Williams <[email protected]>
Committed: Wed Apr 2 16:45:54 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/05b2ae84/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 53bbb77,6929100..94671f1
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -677,16 -648,20 +677,18 @@@ public class StorageService extends Not
// to get schema info from gossip which defeats the purpose. See
CASSANDRA-4427 for the gory details.
Set<InetAddress> current = new HashSet<InetAddress>();
logger.debug("Bootstrap variables: {} {} {} {}",
- new Object[]{ DatabaseDescriptor.isAutoBootstrap(),
- SystemTable.bootstrapInProgress(),
- SystemTable.bootstrapComplete(),
-
DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress())});
- if (DatabaseDescriptor.isAutoBootstrap() &&
!SystemTable.bootstrapComplete() &&
DatabaseDescriptor.getSeeds().contains(FBUtilities.getLocalAddress()))
+ DatabaseDescriptor.isAutoBootstrap(),
+ SystemKeyspace.bootstrapInProgress(),
+ SystemKeyspace.bootstrapComplete(),
+
DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress()));
++ if (DatabaseDescriptor.isAutoBootstrap() &&
!SystemKeyspace.bootstrapComplete() &&
DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress()))
+ logger.info("This node will not auto bootstrap because it is
configured to be a seed node.");
- if (DatabaseDescriptor.isAutoBootstrap()
- && !SystemTable.bootstrapComplete()
- &&
!DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress()))
+ if (shouldBootstrap())
{
- if (SystemTable.bootstrapInProgress())
+ if (SystemKeyspace.bootstrapInProgress())
logger.warn("Detected previous bootstrap failure; retrying");
else
-
SystemTable.setBootstrapState(SystemTable.BootstrapState.IN_PROGRESS);
+
SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.IN_PROGRESS);
setMode(Mode.JOINING, "waiting for ring information", true);
// first sleep the delay to make sure we see all our peers
for (int i = 0; i < delay; i += 1000)
