From de98541708b9a59e918029bb3ed50b0d986d24be Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 3 May 2013 17:54:04 +0200 Subject: [PATCH 1/3] Update version for 1.2.5 release --- CHANGES.txt | 2 +- build.xml | 2 +- debian/changelog | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 21be69547d..3c00e9b714 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -14,7 +14,7 @@ * Fix shutdown of binary protocol server (CASSANDRA-5507) * Fix repair -snapshot not working (CASSANDRA-5512) * Set isRunning flag later in binary protocol server (CASSANDRA-5467) - * Fix use of CQL3 functions with descencind clustering order (CASSANDRA-5472) + * Fix use of CQL3 functions with descending clustering order (CASSANDRA-5472) * Prevent repair when protocol version does not match (CASSANDRA-5523) * Disallow renaming columns one at a time for thrift table in CQL3 (CASSANDRA-5531) diff --git a/build.xml b/build.xml index 05a6c842fb..cef16da205 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ - + diff --git a/debian/changelog b/debian/changelog index c8a62fa816..81c12eb79b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.2.5) unstable; urgency=low + + * New release + + -- Sylvain Lebresne Fri, 03 May 2013 17:52:01 +0200 + cassandra (1.2.4) unstable; urgency=low * New release From c007102c5b2fe2b6abd09a19cbc4b69f5e83ad0b Mon Sep 17 00:00:00 2001 From: Yuki Morishita Date: Fri, 3 May 2013 12:53:16 -0500 Subject: [PATCH 2/3] fix repair test after CASSANDRA-5523 --- .../cassandra/service/AntiEntropyServiceTestAbstract.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java index 7124ecb225..fc0b83254c 100644 --- a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java +++ b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java @@ -43,6 +43,8 @@ import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.locator.TokenMetadata; import static org.apache.cassandra.service.AntiEntropyService.*; + +import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.MerkleTree; @@ -100,6 +102,7 @@ public abstract class AntiEntropyServiceTestAbstract extends SchemaLoader tmd.updateNormalToken(StorageService.getPartitioner().getMinimumToken(), REMOTE); assert tmd.isMember(REMOTE); + MessagingService.instance().setVersion(REMOTE, MessagingService.current_version); Gossiper.instance.initializeNodeUnsafe(REMOTE, UUID.randomUUID(), 1); local_range = StorageService.instance.getPrimaryRangesForEndpoint(tablename, LOCAL).iterator().next(); From fe910e6c90d81cc61c16859bcef9f0dcb42cc827 Mon Sep 17 00:00:00 2001 From: Marcus Eriksson Date: Sat, 4 May 2013 18:49:04 +0200 Subject: [PATCH 3/3] fsync leveled manifest to avoid it getting corrupt Patch by marcuse, reviewed by jbellis and carlyeks for CASSANDRA-5535 --- CHANGES.txt | 2 +- .../org/apache/cassandra/db/compaction/LeveledManifest.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 30a09c9284..5a559a8a15 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,7 +2,7 @@ * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393) * Use allocator information to improve memtable memory usage estimate (CASSANDRA-5497) - + * fsync leveled manifest to avoid corruption (CASSANDRA-5535) 1.1.11 * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index 5f221099f6..8ac7028d1e 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -22,6 +22,7 @@ package org.apache.cassandra.db.compaction; import java.io.File; +import java.io.FileOutputStream; import java.io.IOError; import java.io.IOException; import java.util.*; @@ -534,7 +535,8 @@ public class LeveledManifest JsonFactory f = new JsonFactory(); try { - JsonGenerator g = f.createJsonGenerator(tmpFile, JsonEncoding.UTF8); + FileOutputStream fos = new FileOutputStream(tmpFile); + JsonGenerator g = f.createJsonGenerator(fos, JsonEncoding.UTF8); g.useDefaultPrettyPrinter(); g.writeStartObject(); g.writeArrayFieldStart("generations"); @@ -551,6 +553,8 @@ public class LeveledManifest } g.writeEndArray(); // for field generations g.writeEndObject(); // write global object + g.flush(); + fos.getFD().sync(); g.close(); if (oldFile.exists() && manifestFile.exists())