[5/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/trunk
Commit: 05b2ae84c07f906d0e66cb0718b165381c9898aa
Parents: 133cfd3 a4d7e22
Author: Brandon Williams
Authored: Wed Apr 2 16:45:54 2014 -0500
Committer: Brandon Williams
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 current = new HashSet();
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)
[5/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6c8034b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6c8034b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6c8034b Branch: refs/heads/cassandra-2.1 Commit: e6c8034b186e4091927b7b234dae086cd47009be Parents: b7231ff 35d4b5d Author: Yuki Morishita Authored: Mon Mar 24 07:54:27 2014 -0500 Committer: Yuki Morishita Committed: Mon Mar 24 07:54:27 2014 -0500 -- --
[5/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/service/AntiEntropyService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b50b2b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b50b2b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b50b2b2 Branch: refs/heads/trunk Commit: 4b50b2b2e41aeda86c166059826e8eb1498b24fc Parents: 44cf4a6 6dfca3d Author: Yuki Morishita Authored: Mon Feb 17 11:12:26 2014 -0600 Committer: Yuki Morishita Committed: Mon Feb 17 11:12:26 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/repair/RepairJob.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b50b2b2/CHANGES.txt -- diff --cc CHANGES.txt index c9fabd2,f146166..bdfec11 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -25,33 -9,24 +25,34 @@@ Merged from 1.2 * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700) * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701) * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711) + * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713) - -1.2.15 - * Move handling of migration event source to solve bootstrap race (CASSANDRA-6648) - * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647) - - -1.2.14 - * Reverted code to limit CQL prepared statement cache by size (CASSANDRA-6592) - * add cassandra.default_messaging_version property to allow easier - upgrading from 1.1 (CASSANDRA-6619) - * Allow executing CREATE statements multiple times (CASSANDRA-6471) - * Don't send confusing info with timeouts (CASSANDRA-6491) - * Don't resubmit counter mutation runnables internally (CASSANDRA-6427) - * Don't drop local mutations without a hint (CASSANDRA-6510) - * Don't allow null max_hint_window_in_ms (CASSANDRA-6419) - * Validate SliceRange start and finish lengths (CASSANDRA-6521) +2.0.5 + * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) + * Add ks.cf names to tombstone logging (CASSANDRA-6597) + * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495) + * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) + * Delete unfinished compaction incrementally (CASSANDRA-6086) + * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480) + * Improve replica pinning for cache efficiency in DES (CASSANDRA-6485) + * Fix LOCAL_SERIAL from thrift (CASSANDRA-6584) + * Don't special case received counts in CAS timeout exceptions (CASSANDRA-6595) + * Add support for 2.1 global counter shards (CASSANDRA-6505) + * Fix NPE when streaming connection is not yet established (CASSANDRA-6210) + * Avoid rare duplicate read repair triggering (CASSANDRA-6606) + * Fix paging discardFirst (CASSANDRA-6555) + * Fix ArrayIndexOutOfBoundsException in 2ndary index query (CASSANDRA-6470) + * Release sstables upon rebuilding 2i (CASSANDRA-6635) + * Add AbstractCompactionStrategy.startup() method (CASSANDRA-6637) + * SSTableScanner may skip rows during cleanup (CASSANDRA-6638) + * sstables from stalled repair sessions can resurrect deleted data (CASSANDRA-6503) + * Switch stress to use ITransportFactory (CASSANDRA-6641) + * Fix IllegalArgumentException during prepare (CASSANDRA-6592) + * Fix possible loss of 2ndary index entries during compaction (CASSANDRA-6517) + * Fix direct Memory on architectures that do not support unaligned long access + (CASSANDRA-6628) + * Let scrub optionally skip broken counter partitions (CASSANDRA-5930) +Merged from 1.2: * fsync compression metadata (CASSANDRA-6531) * Validate CF existence on execution for prepared statement (CASSANDRA-6535) * Add ability to throttle batchlog replay (CASSANDRA-6550) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b50b2b2/src/java/org/apache/cassandra/repair/RepairJob.java -- diff --cc src/java/org/apache/cassandra/repair/RepairJob.java index 16daf4e,000..6705c95 mode 100644,00..100644 --- a/src/java/org/apache/cassandra/repair/RepairJob.java +++ b/src/java/org/apache/cassandra/repair/RepairJob.java @@@ -1,224 -1,0 +1,224 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License")
