Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7DC2210491 for ; Mon, 7 Sep 2015 06:20:12 +0000 (UTC) Received: (qmail 62812 invoked by uid 500); 7 Sep 2015 06:20:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 62721 invoked by uid 500); 7 Sep 2015 06:20:05 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 62324 invoked by uid 99); 7 Sep 2015 06:20:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2015 06:20:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5DC0EDFCF2; Mon, 7 Sep 2015 06:20:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Mon, 07 Sep 2015 06:20:10 -0000 Message-Id: <284fa79aab6042b4831d766c76fef610@git.apache.org> In-Reply-To: <8f06dfe7dbe64c80a0e9d4bf432c5717@git.apache.org> References: <8f06dfe7dbe64c80a0e9d4bf432c5717@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/8] cassandra git commit: Properly deserialize PrepareMessage for global repairs Properly deserialize PrepareMessage for global repairs Patch by marcuse; reviewed by yukim for CASSANDRA-10265 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dae2045f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dae2045f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dae2045f Branch: refs/heads/trunk Commit: dae2045f0b444f4857141463335893becaa05a89 Parents: 99c6ad6 Author: Marcus Eriksson Authored: Fri Sep 4 10:20:31 2015 +0200 Committer: Marcus Eriksson Committed: Mon Sep 7 08:04:52 2015 +0200 ---------------------------------------------------------------------- NEWS.txt | 4 ++++ .../cassandra/repair/messages/PrepareMessage.java | 12 ++++++++++-- .../apache/cassandra/repair/messages/RepairMessage.java | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dae2045f/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index 2523af2..4c2c52e 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -22,6 +22,10 @@ Changed Defaults - commitlog_total_space_in_mb will use the smaller of 8192, and 1/4 of the total space of the commitlog volume. (Before: always used 8192) + - Incremental repair is on by default since 2.2.0, run full repairs by + providing the '-full' parameter to nodetool repair. + - Parallel repairs are the default since 2.2.0, run sequential repairs + by providing the '-seq' parameter to nodetool repair. 2.2.1 http://git-wip-us.apache.org/repos/asf/cassandra/blob/dae2045f/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java b/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java index a57c27e..3a00376 100644 --- a/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java +++ b/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java @@ -34,7 +34,8 @@ import org.apache.cassandra.utils.UUIDSerializer; public class PrepareMessage extends RepairMessage { - public final static MessageSerializer serializer = new PrepareMessageSerializer(); + public final static MessageSerializer serializer = new PrepareMessageSerializer(false); + public final static MessageSerializer globalSerializer = new PrepareMessageSerializer(true); public final List cfIds; public final Collection> ranges; @@ -52,6 +53,13 @@ public class PrepareMessage extends RepairMessage public static class PrepareMessageSerializer implements MessageSerializer { + private final boolean isGlobal; + + public PrepareMessageSerializer(boolean global) + { + this.isGlobal = global; + } + public void serialize(PrepareMessage message, DataOutputPlus out, int version) throws IOException { out.writeInt(message.cfIds.size()); @@ -80,7 +88,7 @@ public class PrepareMessage extends RepairMessage ranges.add((Range) Range.tokenSerializer.deserialize(in, MessagingService.globalPartitioner(), version)); boolean isIncremental = in.readBoolean(); - return new PrepareMessage(parentRepairSession, cfIds, ranges, isIncremental, false); + return new PrepareMessage(parentRepairSession, cfIds, ranges, isIncremental, isGlobal); } public long serializedSize(PrepareMessage message, int version) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dae2045f/src/java/org/apache/cassandra/repair/messages/RepairMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/messages/RepairMessage.java b/src/java/org/apache/cassandra/repair/messages/RepairMessage.java index d78c2fd..82e474f 100644 --- a/src/java/org/apache/cassandra/repair/messages/RepairMessage.java +++ b/src/java/org/apache/cassandra/repair/messages/RepairMessage.java @@ -45,7 +45,7 @@ public abstract class RepairMessage SYNC_COMPLETE(3, SyncComplete.serializer), ANTICOMPACTION_REQUEST(4, AnticompactionRequest.serializer), PREPARE_MESSAGE(5, PrepareMessage.serializer), - PREPARE_GLOBAL_MESSAGE(8, PrepareMessage.serializer), + PREPARE_GLOBAL_MESSAGE(8, PrepareMessage.globalSerializer), SNAPSHOT(6, SnapshotMessage.serializer), CLEANUP(7, CleanupMessage.serializer);