cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [07/10] git commit: merge from 2.0
Date Tue, 15 Jul 2014 14:57:48 GMT
merge from 2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04017616
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04017616
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04017616

Branch: refs/heads/trunk
Commit: 04017616e8cfb7952fcc909d69aa644f6cb981f3
Parents: 9460503 1630ebf
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Jul 15 09:57:21 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Jul 15 09:57:21 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 5 +++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/04017616/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d3390f9,d339309..193cff8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,7 +1,33 @@@
 -2.0.10
 +2.1.0-final
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 +Merged from 2.0:
+  * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
   * Fix range merging when DES scores are zero (CASSANDRA-7535)
   * Warn when SSL certificates have expired (CASSANDRA-7528)
 + * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 +Merged from 1.2:
 + * Set correct stream ID on responses when non-Exception Throwables
 +   are thrown while handling native protocol messages (CASSANDRA-7470)
 +
 +
 +2.1.0-rc3
 + * Consider expiry when reconciling otherwise equal cells (CASSANDRA-7403)
 + * Introduce CQL support for stress tool (CASSANDRA-6146)
 + * Fix ClassCastException processing expired messages (CASSANDRA-7496)
 + * Fix prepared marker for collections inside UDT (CASSANDRA-7472)
 + * Remove left-over populate_io_cache_on_flush and replicate_on_write
 +   uses (CASSANDRA-7493)
 + * (Windows) handle spaces in path names (CASSANDRA-7451)
 + * Ensure writes have completed after dropping a table, before recycling
 +   commit log segments (CASSANDRA-7437)
 + * Remove left-over rows_per_partition_to_cache (CASSANDRA-7493)
 + * Fix error when CONTAINS is used with a bind marker (CASSANDRA-7502)
 + * Properly reject unknown UDT field (CASSANDRA-7484)
 +Merged from 2.0:
 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 + * Support DISTINCT for static columns and fix behaviour when DISTINC is
 +   not use (CASSANDRA-7305).
   * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
   * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
   * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM

http://git-wip-us.apache.org/repos/asf/cassandra/blob/04017616/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 3fd3781,c6f4ec9..8ace958
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2570,10 -2504,10 +2570,15 @@@ public class StorageService extends Not
          if (Keyspace.SYSTEM_KS.equals(keyspace) || ranges.isEmpty())
              return 0;
  
 -        final int cmd = nextRepairCommand.incrementAndGet();
 +        int cmd = nextRepairCommand.incrementAndGet();
          if (ranges.size() > 0)
          {
 -            new Thread(createRepairTask(cmd, keyspace, ranges, isSequential, dataCenters,
hosts, columnFamilies)).start();
++            if (!FBUtilities.isUnix() && isSequential)
++            {
++                logger.warn("Snapshot-based repair is not yet supported on Windows.  Reverting
to parallel repair.");
++                isSequential = false;
++            }
 +            new Thread(createRepairTask(cmd, keyspace, ranges, isSequential, dataCenters,
hosts, fullRepair, columnFamilies)).start();
          }
          return cmd;
      }


Mime
View raw message