From patchwork Mon Feb 15 09:52:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changlong Xie X-Patchwork-Id: 8312221 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3C2C49F372 for ; Mon, 15 Feb 2016 09:52:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 963BA2042B for ; Mon, 15 Feb 2016 09:51:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A67FE202F8 for ; Mon, 15 Feb 2016 09:51:58 +0000 (UTC) Received: from localhost ([::1]:58448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVFoz-00053L-Rr for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Feb 2016 04:51:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVFos-00053C-OY for qemu-devel@nongnu.org; Mon, 15 Feb 2016 04:51:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVFoo-00040F-Nb for qemu-devel@nongnu.org; Mon, 15 Feb 2016 04:51:50 -0500 Received: from [59.151.112.132] (port=30425 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVFoo-0003v8-8p for qemu-devel@nongnu.org; Mon, 15 Feb 2016 04:51:46 -0500 X-IronPort-AV: E=Sophos;i="5.20,346,1444665600"; d="scan'208";a="3558651" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 Feb 2016 17:51:28 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 91D9B421917C; Mon, 15 Feb 2016 17:49:58 +0800 (CST) Received: from changlox.g08.fujitsu.local (10.167.225.55) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Mon, 15 Feb 2016 17:51:28 +0800 From: Changlong Xie To: qemu devel , Alberto Garcia , Kevin Wolf , Eric Blake Date: Mon, 15 Feb 2016 17:52:48 +0800 Message-ID: <1455529968-21772-2-git-send-email-xiecl.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1455529968-21772-1-git-send-email-xiecl.fnst@cn.fujitsu.com> References: <1455529968-21772-1-git-send-email-xiecl.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.55] X-yoursite-MailScanner-ID: 91D9B421917C.A093A X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xiecl.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: "Dr. David Alan Gilbert" Subject: [Qemu-devel] [PATCH 1/1] quorum: change vote rules for 64 bits hash X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Before: 1) vote_count > max: winner = candidate, update max 2) vote_count <= max: do nothing Current: 1) vote_count > max: winner = candidate, update max 2) vote_count = max: compare the value of winner with candidate, if candidate->value.l == 0, winner = candidate, else do nothing 3) vote_count < max: do nothing Signed-off-by: Wen Congyang Signed-off-by: Changlong Xie --- block/quorum.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/block/quorum.c b/block/quorum.c index a5ae4b8..e431ff4 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -446,7 +446,7 @@ static int quorum_compute_hash(QuorumAIOCB *acb, int i, QuorumVoteValue *hash) return 0; } -static QuorumVoteVersion *quorum_get_vote_winner(QuorumVotes *votes) +static QuorumVoteVersion *quorum_get_vote_winner(QuorumVotes *votes, bool vote_error) { int max = 0; QuorumVoteVersion *candidate, *winner = NULL; @@ -455,6 +455,12 @@ static QuorumVoteVersion *quorum_get_vote_winner(QuorumVotes *votes) if (candidate->vote_count > max) { max = candidate->vote_count; winner = candidate; + continue; + } + /* For 64 bit hash */ + if (vote_error == true && candidate->vote_count == max + && candidate->value.l == 0) { + winner = candidate; } } @@ -544,7 +550,7 @@ static int quorum_vote_error(QuorumAIOCB *acb) } if (error) { - winner = quorum_get_vote_winner(&error_votes); + winner = quorum_get_vote_winner(&error_votes, false); ret = winner->value.l; } @@ -609,7 +615,7 @@ static bool quorum_vote(QuorumAIOCB *acb) } /* vote to select the most represented version */ - winner = quorum_get_vote_winner(&acb->votes); + winner = quorum_get_vote_winner(&acb->votes, false); /* if the winner count is smaller than threshold the read fails */ if (winner->vote_count < s->threshold) { @@ -769,7 +775,7 @@ static coroutine_fn int quorum_co_flush(BlockDriverState *bs) quorum_count_vote(&error_votes, &result_value, i); } - winner = quorum_get_vote_winner(&error_votes); + winner = quorum_get_vote_winner(&error_votes, true); result = winner->value.l; quorum_free_vote_list(&error_votes);