From commits-return-3359-apmail-rocketmq-commits-archive=rocketmq.apache.org@rocketmq.apache.org Mon Apr 29 02:38:20 2019 Return-Path: X-Original-To: apmail-rocketmq-commits-archive@minotaur.apache.org Delivered-To: apmail-rocketmq-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id AC921196C6 for ; Mon, 29 Apr 2019 02:38:19 +0000 (UTC) Received: (qmail 2429 invoked by uid 500); 29 Apr 2019 02:38:19 -0000 Delivered-To: apmail-rocketmq-commits-archive@rocketmq.apache.org Received: (qmail 2395 invoked by uid 500); 29 Apr 2019 02:38:18 -0000 Mailing-List: contact commits-help@rocketmq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@rocketmq.apache.org Delivered-To: mailing list commits@rocketmq.apache.org Received: (qmail 2386 invoked by uid 99); 29 Apr 2019 02:38:18 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Apr 2019 02:38:18 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 99499854AC; Mon, 29 Apr 2019 02:38:18 +0000 (UTC) Date: Mon, 29 Apr 2019 02:38:18 +0000 To: "commits@rocketmq.apache.org" Subject: [rocketmq] branch develop updated: [ISSUE #1164]Fix Consumer Instance can't consume message from slave when cluster is in the high level tps and master has been killed. (#1181) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155650549851.5216.18306548418656302393@gitbox.apache.org> From: huzongtang@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: rocketmq X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: b3384d289e12641db1628c03b40f7cc714fc99fd X-Git-Newrev: 84d2260b87bf027fbf6fccb570ca6750fd78c9d3 X-Git-Rev: 84d2260b87bf027fbf6fccb570ca6750fd78c9d3 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. huzongtang pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/rocketmq.git The following commit(s) were added to refs/heads/develop by this push: new 84d2260 [ISSUE #1164]Fix Consumer Instance can't consume message from slave when cluster is in the high level tps and master has been killed. (#1181) 84d2260 is described below commit 84d2260b87bf027fbf6fccb570ca6750fd78c9d3 Author: Hu Zongtang AuthorDate: Mon Apr 29 10:38:12 2019 +0800 [ISSUE #1164]Fix Consumer Instance can't consume message from slave when cluster is in the high level tps and master has been killed. (#1181) * [issue#1164]return the codes to original reput method part. * [issue#1164]fix issue that Consumer Instance can't consume message from slave when cluster is in the high level tps and master has been killed. * [issue#1164]if the broker is a master node,then modify reputFromOffset correctly. * [issue#1164]add some coding comments. --- .../main/java/org/apache/rocketmq/store/DefaultMessageStore.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java index 70efabf..f254dd1 100644 --- a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java +++ b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java @@ -1864,10 +1864,12 @@ public class DefaultMessageStore implements MessageStore { this.reputFromOffset += size; } else { doNext = false; - if (DefaultMessageStore.this.getMessageStoreConfig().isEnableDLegerCommitLog()) { + // If user open the dledger pattern or the broker is master node, + // it will not ignore the exception and fix the reputFromOffset variable + if (DefaultMessageStore.this.getMessageStoreConfig().isEnableDLegerCommitLog() || + DefaultMessageStore.this.brokerConfig.getBrokerId() == MixAll.MASTER_ID) { log.error("[BUG]dispatch message to consume queue error, COMMITLOG OFFSET: {}", this.reputFromOffset); - this.reputFromOffset += result.getSize() - readSize; } }