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#6116] Refactor ClientManager and make register client and schedule checkTask is atomic. #6118

Merged
merged 1 commit into from
Jun 22, 2021

Conversation

KomachiSion
Copy link
Collaborator

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

Fixes #6116 .

Brief changelog

  • Refactor ClientManager and make register client and schedule checkTask is atomic.

Verifying this change

Follow this checklist to help us incorporate your contribution quickly and easily:

  • 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 to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

@KomachiSion KomachiSion added the kind/bug Category issues or prs related to bug. label Jun 21, 2021
@KomachiSion KomachiSion added this to the 2.0.3 milestone Jun 21, 2021
@KomachiSion KomachiSion force-pushed the develop-issue#6116 branch 2 times, most recently from 780ee08 to 9563b7b Compare June 21, 2021 09:46
@@ -170,7 +171,10 @@ public Response onApply(WriteRequest request) {

private void onInstanceRegister(Service service, Instance instance, String clientId) {
Service singleton = ServiceManager.getInstance().getSingleton(service);
Client client = clientManager.computeIfAbsent(clientId, () -> new IpPortBasedClient(clientId, false));
if (!clientManager.contains(clientId)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This contains is unnecessary.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

To reduce invalid object create. When the node handle the register persistent instance, the client has been create and register. There is no need to create and try create again.

@@ -289,6 +293,7 @@ protected void loadSnapshot(byte[] snapshotBytes) {
ConcurrentHashMap<String, IpPortBasedClient> snapshot = new ConcurrentHashMap<>(newData.size());
for (Map.Entry<String, ClientSyncData> entry : newData.entrySet()) {
IpPortBasedClient snapshotClient = new IpPortBasedClient(entry.getKey(), false);
Copy link
Contributor

Choose a reason for hiding this comment

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

Consider using factory ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Using factory will add multiple dependencies. So I think no neccessary.

@horizonzy horizonzy merged commit 4a474ce into alibaba:develop Jun 22, 2021
@KomachiSion KomachiSion deleted the develop-issue#6116 branch June 22, 2021 02:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Category issues or prs related to bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to check client beats when register same ip and port in old clients with high concurrent
3 participants