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 93401182DC for ; Thu, 6 Aug 2015 14:44:16 +0000 (UTC) Received: (qmail 71640 invoked by uid 500); 6 Aug 2015 14:44:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 71611 invoked by uid 500); 6 Aug 2015 14:44:16 -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 71597 invoked by uid 99); 6 Aug 2015 14:44:16 -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; Thu, 06 Aug 2015 14:44:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5191CE6B7E; Thu, 6 Aug 2015 14:44:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Thu, 06 Aug 2015 14:44:15 -0000 Message-Id: <39a911e7226f425a82007bf120c5f40e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cassandra git commit: Fix Verb.BATCHLOG_MUTATION usages in StorageProxy Repository: cassandra Updated Branches: refs/heads/trunk c35bfc09c -> 414685381 Fix Verb.BATCHLOG_MUTATION usages in StorageProxy patch by Carl Yeksigian; reviewed by Aleksey Yeschenko for CASSANDRA-9992 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16498de4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16498de4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16498de4 Branch: refs/heads/trunk Commit: 16498de42d1e173f39d7edeba5ab7d567e609cc6 Parents: 762db47 Author: Carl Yeksigian Authored: Wed Aug 5 11:42:01 2015 -0400 Committer: Aleksey Yeschenko Committed: Thu Aug 6 17:42:45 2015 +0300 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageProxy.java | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/16498de4/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index b637b17..2c3c018 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -837,18 +837,18 @@ public class StorageProxy implements StorageProxyMBean { insertLocal(Stage.BATCHLOG_MUTATION, message.payload, handler); } - else if (targetVersion == MessagingService.current_version) - { - MessagingService.instance().sendRR(message, target, handler, false); - } - else + else if (targetVersion < MessagingService.VERSION_30) { MessagingService.instance().sendRR(BatchlogManager.getBatchlogMutationFor(mutations, uuid, targetVersion) - .createMessage(MessagingService.Verb.BATCHLOG_MUTATION), + .createMessage(MessagingService.Verb.MUTATION), target, handler, false); } + else + { + MessagingService.instance().sendRR(message, target, handler, false); + } } handler.get(); @@ -870,10 +870,22 @@ public class StorageProxy implements StorageProxyMBean MessageOut message = mutation.createMessage(MessagingService.Verb.BATCHLOG_MUTATION); for (InetAddress target : endpoints) { + int targetVersion = MessagingService.instance().getVersion(target); if (canDoLocalRequest(target)) + { insertLocal(Stage.BATCHLOG_MUTATION, message.payload, handler); + } + else if (targetVersion < MessagingService.VERSION_30) + { + MessagingService.instance().sendRR(mutation.createMessage(MessagingService.Verb.MUTATION), + target, + handler, + false); + } else + { MessagingService.instance().sendRR(message, target, handler, false); + } } }