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.

Sign up for GitHub

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

Jump to bottom

[ISSUE #3781]Fix service list intermittently lost service #3891

Merged
merged 8 commits into from
Sep 23, 2020
Merged

[ISSUE #3781]Fix service list intermittently lost service #3891

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c648249
Merge pull request #2964 from alibaba/develop
yanlinly Jun 5, 2020
5e53396
Merge pull request #3295 from alibaba/develop
KomachiSion Jul 10, 2020
1385705
Merge pull request #1 from alibaba/master
binbin0325 Jul 24, 2020
b519af0
Merge pull request #2 from alibaba/develop
binbin0325 Sep 9, 2020
8582c0d
Merge pull request #3 from alibaba/develop
binbin0325 Sep 20, 2020
3a7fec6
update service init
binbin0325 Sep 22, 2020
816ab12
commit futureMap.remove()
binbin0325 Sep 22, 2020
a0eca7b
update serviceManager
binbin0325 Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update service init
  • Loading branch information
@binbin0325
binbin0325 committed Sep 22, 2020
commit 3a7fec663a863722ec111bfcb03a24e2b4938231
25 changes: 15 additions & 10 deletions naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.Sets;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
Expand All @@ -56,14 +63,6 @@
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;

import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;

/**
* Core manager storing all services in Nacos.
Expand Down Expand Up @@ -712,12 +711,18 @@ public void putService(Service service) {
}
}
}
serviceMap.get(service.getNamespaceId()).put(service.getName(), service);
Map map = serviceMap.get(service.getNamespaceId());
synchronized (map) {
if (map.get(service.getName()) == null) {
service.init();
}
map.put(service.getName(), service);
}

}

private void putServiceAndInit(Service service) throws NacosException {
putService(service);
service.init();
consistencyService
.listen(KeyBuilder.buildInstanceListKey(service.getNamespaceId(), service.getName(), true), service);
consistencyService
Expand Down
2 changes: 1 addition & 1 deletion naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckReactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static ScheduledFuture<?> scheduleCheck(HealthCheckTask task) {
* @param task client beat check task
*/
public static void scheduleCheck(ClientBeatCheckTask task) {
futureMap.putIfAbsent(task.taskKey(), GlobalExecutor.scheduleNamingHealth(task, 5000, 5000, TimeUnit.MILLISECONDS));
futureMap.put(task.taskKey(), GlobalExecutor.scheduleNamingHealth(task, 5000, 5000, TimeUnit.MILLISECONDS));
}

/**
Expand Down