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

[ISSUE #3922] method createServiceIfAbsent in ServiceManager require sync #4713

Merged
merged 2 commits into from
Jan 18, 2021
Merged

[ISSUE #3922] method createServiceIfAbsent in ServiceManager require sync #4713

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d37ee66
fix_#3922
a7217107 Jan 15, 2021
2fe7b5f
roll back createServiceIfAbsent
a7217107 Jan 16, 2021
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
39 changes: 21 additions & 18 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 @@ -466,24 +466,27 @@ public void createServiceIfAbsent(String namespaceId, String serviceName, boolea
throws NacosException {
Service service = getService(namespaceId, serviceName);
if (service == null) {

Loggers.SRV_LOG.info("creating empty service {}:{}", namespaceId, serviceName);
service = new Service();
service.setName(serviceName);
service.setNamespaceId(namespaceId);
service.setGroupName(NamingUtils.getGroupName(serviceName));
// now validate the service. if failed, exception will be thrown
service.setLastModifiedMillis(System.currentTimeMillis());
service.recalculateChecksum();
if (cluster != null) {
cluster.setService(service);
service.getClusterMap().put(cluster.getName(), cluster);
}
service.validate();

putServiceAndInit(service);
if (!local) {
addOrReplaceService(service);
synchronized (this) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

lock in this may affect the performance.
I think fix like following will be better

    public void putService(Service service) {
        if (!serviceMap.containsKey(service.getNamespaceId())) {
            synchronized (putServiceLock) {
                if (!serviceMap.containsKey(service.getNamespaceId())) {
                    serviceMap.put(service.getNamespaceId(), new ConcurrentHashMap<>(16));
                }
            }
        }
        *serviceMap.get(service.getNamespaceId()).putIfAbsent(service.getName(), service);
    }

    private void putServiceAndInit(Service service) throws NacosException {
        putService(service);
        *service = getService(service.getNamespaceId(), service.getName());
        service.init();
        consistencyService.listen(KeyBuilder.buildInstanceListKey(service.getNamespaceId(), service.getName(), true), service);
        consistencyService.listen(KeyBuilder.buildInstanceListKey(service.getNamespaceId(), service.getName(), false), service);
        Loggers.SRV_LOG.info("[NEW-SERVICE] {}", service.toJSON());
    }

What's your think about

Copy link
Contributor Author

Choose a reason for hiding this comment

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

you are right, "synchronized (this)" in this method will affect the performance, your plan is better

if(getService(namespaceId, serviceName) == null) {
Loggers.SRV_LOG.info("creating empty service {}:{}", namespaceId, serviceName);
service = new Service();
service.setName(serviceName);
service.setNamespaceId(namespaceId);
service.setGroupName(NamingUtils.getGroupName(serviceName));
// now validate the service. if failed, exception will be thrown
service.setLastModifiedMillis(System.currentTimeMillis());
service.recalculateChecksum();
if (cluster != null) {
cluster.setService(service);
service.getClusterMap().put(cluster.getName(), cluster);
}
service.validate();

putServiceAndInit(service);
if (!local) {
addOrReplaceService(service);
}
}
}
}
}
Expand Down