cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject cassandra git commit: Fix AssertionError when resetlocalschema is run during repair
Date Thu, 30 Apr 2015 16:39:48 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 75e858a66 -> a85e731f2


Fix AssertionError when resetlocalschema is run during repair

Patch by tjake; reviewed by carlyeks for CASSANDRA-9249


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

Branch: refs/heads/cassandra-2.0
Commit: a85e731f297236f6f43ea95c3549f2d1424926fa
Parents: 75e858a
Author: T Jake Luciani <jake@apache.org>
Authored: Thu Apr 30 12:36:32 2015 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Thu Apr 30 12:39:33 2015 -0400

----------------------------------------------------------------------
 CHANGES.txt                                                         | 1 +
 .../org/apache/cassandra/io/compress/CompressionParameters.java     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85e731f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8a3e5a9..9f90cc2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.15:
+ * Fix assertion error when resetlocalschema is run during repair (CASSANDRA-9249)
  * Disable single sstable tombstone compactions for DTCS by default (CASSANDRA-9234)
  * Do more agressive ttl expiration checks to be able to
    drop more sstables (CASSANDRA-8243)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85e731f/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/compress/CompressionParameters.java b/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
index 98f01d4..cf16711 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
@@ -108,7 +108,6 @@ public class CompressionParameters
         if (liveMetadata == null)
             return;
 
-        assert this.liveMetadata == null || this.liveMetadata == liveMetadata;
         this.liveMetadata = liveMetadata;
     }
 


Mime
View raw message