Skip to content

[ISSUE #11994]修复HttpRequestInstanceBuilderTest出现的空指针问题，优化SnowFlakeInstanceIdGenerator初始化流程 #11995

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

Merged
KomachiSion merged 3 commits into from
Apr 23, 2024
Merged

[ISSUE #11994]修复HttpRequestInstanceBuilderTest出现的空指针问题，优化SnowFlakeInstanceIdGenerator初始化流程 #11995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6635663
[ISSUE #11994] fix: Initialize EnvUtil's variable environment in Http…
llzcx Apr 22, 2024
96e81ac
refactor: Optimize the initialization process of SnowFlakeInstanceIdG…
llzcx Apr 22, 2024
f724707
refactor: optimize the initialization process of SnowFlakeInstanceIdG…
llzcx Apr 22, 2024
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
23 changes: 19 additions & 4 deletions ...ng/src/main/java/com/alibaba/nacos/naming/pojo/instance/SnowFlakeInstanceIdGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,28 @@
public class SnowFlakeInstanceIdGenerator implements InstanceIdGenerator {

private static final SnowFlowerIdGenerator SNOW_FLOWER_ID_GENERATOR = new SnowFlowerIdGenerator();

static {
SNOW_FLOWER_ID_GENERATOR.init();

private static volatile boolean initialize = false;

private static final Object LOCK = new Object();

/**
* initialize the workerId and ensure that it is only initialized once.
*/
private void ensureWorkerIdInitialization() {
if (!initialize) {
synchronized (LOCK) {
if (!initialize) {
SNOW_FLOWER_ID_GENERATOR.init();
initialize = true;
}
}
}
}

@Override
public String generateInstanceId(Instance instance) {
ensureWorkerIdInitialization();
return SNOW_FLOWER_ID_GENERATOR.nextId() + NAMING_INSTANCE_ID_SPLITTER
+ instance.getClusterName() + NAMING_INSTANCE_ID_SPLITTER
+ instance.getServiceName();
Expand Down
3 changes: 3 additions & 0 deletions .../src/test/java/com/alibaba/nacos/naming/pojo/instance/HttpRequestInstanceBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.common.spi.NacosServiceLoader;
import com.alibaba.nacos.naming.misc.UtilsAndCommons;
import com.alibaba.nacos.sys.env.EnvUtil;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.core.env.StandardEnvironment;

import javax.servlet.http.HttpServletRequest;

Expand Down Expand Up @@ -54,6 +56,7 @@ public class HttpRequestInstanceBuilderTest {
@BeforeClass
public static void setUpBeforeClass() {
NacosServiceLoader.load(InstanceExtensionHandler.class);
EnvUtil.setEnvironment(new StandardEnvironment());
Copy link
Contributor

@The-Gamer-01 The-Gamer-01 Apr 22, 2024

Choose a reason for hiding this comment

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

LGTM

}

@Before
Expand Down