Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #88] select slave broker when master broker is unavailable. #105

Merged
merged 1 commit into from
Apr 3, 2019

Conversation

ifplusor
Copy link
Contributor

@ifplusor ifplusor commented Mar 10, 2019

What is the purpose of the change

ISSUE #88
fixed the bug, can't select slave broker when findConsumerIds. this cause can't consume slave.

Brief changelog

select broker random first, and use the master. if the master is unavailable, select a slave of it.

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily. Notice, it would be helpful if you could finish the following 5 checklist(the last one is not necessary)before request the community to review your PR.

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test(over 80% coverage) to verify your logic correction, more mock a little better when a cross-module dependency exists.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

@ifplusor ifplusor changed the title [ISSUE #88] select slave broker when master broker is down. [ISSUE #88] select slave broker when master broker is unavailable. Mar 10, 2019
@ifplusor ifplusor force-pushed the fixed-select-slave branch 4 times, most recently from 6264ac7 to 6e958e2 Compare March 15, 2019 07:25
found = true;
} else if (!onlyThisBroker) { // not only from master
iter = brokerMap.begin();
brokerAddr = iter->second;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think here need add if(iter != brokerMap.end())

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have changed it.

merged from MQClientInstance#findBrokerAddrByTopic, BrokerData#selectBrokerAddr and MQClientInstance#findBrokerAddressInSubscribe in Java client.
@ifplusor ifplusor force-pushed the fixed-select-slave branch from 6e958e2 to d379ba6 Compare March 25, 2019 21:19
@ShannonDing ShannonDing added the enhancement New feature or request label Apr 3, 2019
@ShannonDing ShannonDing added this to the 1.2.3 milestone Apr 3, 2019
@ShannonDing ShannonDing merged commit 46ee33b into apache:master Apr 3, 2019
@ifplusor ifplusor deleted the fixed-select-slave branch April 3, 2019 02:49
@ShannonDing ShannonDing modified the milestones: 1.2.3, 1.2.2 Apr 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants