You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by di...@apache.org on 2019/01/18 09:12:59 UTC

[rocketmq-client-cpp] branch master updated: Remove the unnessesary code it may cause dead loop for some scene (#69)

This is an automated email from the ASF dual-hosted git repository.

dinglei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-client-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 5fc3216   Remove the unnessesary code it may cause dead loop for some scene (#69)
5fc3216 is described below

commit 5fc32161b7218c58442b501b826b541267fdf8bd
Author: Jonnxu <jo...@163.com>
AuthorDate: Fri Jan 18 17:12:55 2019 +0800

     Remove the unnessesary code it may cause dead loop for some scene (#69)
    
    Remove the unnecessary code it may cause dead loop for some scene
---
 src/MQClientFactory.cpp    | 2 +-
 src/consumer/Rebalance.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MQClientFactory.cpp b/src/MQClientFactory.cpp
index 606ccc1..4eccf34 100644
--- a/src/MQClientFactory.cpp
+++ b/src/MQClientFactory.cpp
@@ -1065,7 +1065,7 @@ void MQClientFactory::resetOffset(
         pullreq->setDroped(true);
         LOG_INFO("resetOffset setDroped for opaque:%d, mq:%s", pullreq->getLatestPullRequestOpaque(), mq.toString().data());
         //delete the opaque record that's ignore the response of this pullrequest when drop pullrequest
-        removeDropedPullRequestOpaque(pullreq);
+        //removeDropedPullRequestOpaque(pullreq);
         pullreq->clearAllMsgs();
         pullreq->updateQueueMaxOffset(it->second);
       } else {
diff --git a/src/consumer/Rebalance.cpp b/src/consumer/Rebalance.cpp
index f23b727..3460457 100644
--- a/src/consumer/Rebalance.cpp
+++ b/src/consumer/Rebalance.cpp
@@ -472,7 +472,7 @@ bool RebalancePush::updateRequestTableInRebalance(
         if (!(it->second->isDroped())) {
           it->second->setDroped(true);
           //delete the lastest pull request for this mq, which hasn't been response
-          m_pClientFactory->removeDropedPullRequestOpaque(it->second);
+          //m_pClientFactory->removeDropedPullRequestOpaque(it->second);
           removeUnnecessaryMessageQueue(mqtemp);
           it->second->clearAllMsgs();  // add clear operation to avoid bad state
                                        // when dropped pullRequest returns