[rocketmq] branch develop updated: [issue#1164]Consumer Instance can't consume message from slave when the TPS of cluster is in the high level and master has been killed.

[huzongtang]

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 b3384d2  [issue#1164]Consumer Instance can't consume message from 
slave when the TPS of cluster is in the high level and master has been killed.
b3384d2 is described below

commit b3384d289e12641db1628c03b40f7cc714fc99fd
Author: huzongtang <huzongt...@cmss.chinamobile.com>
AuthorDate: Sat Apr 27 11:49:02 2019 +0800

    [issue#1164]Consumer Instance can't consume message from slave when the TPS 
of cluster is in the high level and master has been killed.
---
 .../main/java/org/apache/rocketmq/store/DefaultMessageStore.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 6cec58d..70efabf 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;
-                                    log.error("[BUG]dispatch message to 
consume queue error, COMMITLOG OFFSET: {}",
-                                        this.reputFromOffset);
+                                    if 
(DefaultMessageStore.this.getMessageStoreConfig().isEnableDLegerCommitLog()) {
+                                        log.error("[BUG]dispatch message to 
consume queue error, COMMITLOG OFFSET: {}",
+                                            this.reputFromOffset);
 
-                                    this.reputFromOffset += result.getSize() - 
readSize;
+                                        this.reputFromOffset += 
result.getSize() - readSize;
+                                    }
                                 }
                             }
                         }