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

fix DoaminRegistry multi inited #1257

Merged
merged 2 commits into from
Oct 26, 2022
Merged

fix DoaminRegistry multi inited #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe0bb81
fix DoaminRegistry multi inited
OrezzerO Oct 20, 2022
93cb084
fmt code
OrezzerO Oct 20, 2022
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
31 changes: 16 additions & 15 deletions registry/registry-local/src/main/java/com/alipay/sofa/rpc/registry/local/DomainRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -72,6 +73,8 @@ public class DomainRegistry extends Registry {
*/
protected ScheduledService scheduledExecutorService;

protected AtomicBoolean inited = new AtomicBoolean();

/**
* 注册中心配置
*
Expand All @@ -83,29 +86,27 @@ protected DomainRegistry(RegistryConfig registryConfig) {

@Override
public void init() {
this.scanPeriod = CommonUtils.parseInt(registryConfig.getParameter("registry.domain.scan.period"),
scanPeriod);
if (inited.compareAndSet(false, true)) {
this.scanPeriod = CommonUtils.parseInt(registryConfig.getParameter("registry.domain.scan.period"),
scanPeriod);

Runnable task = new Runnable() {
@Override
public void run() {
Runnable task = () -> {
try {
refreshDomain();
notifyListener();
} catch (Throwable e) {
LOGGER.error(e.getMessage(), e);
}
}
};

scheduledExecutorService = new ScheduledService("DomainRegistry-Back-Load",
ScheduledService.MODE_FIXEDDELAY,
task, //定时load任务
scanPeriod, // 延迟一个周期
scanPeriod, // 一个周期循环
TimeUnit.MILLISECONDS
).start();
};

scheduledExecutorService = new ScheduledService("DomainRegistry-Back-Load",
ScheduledService.MODE_FIXEDDELAY,
task, //定时load任务
scanPeriod, // 延迟一个周期
scanPeriod, // 一个周期循环
TimeUnit.MILLISECONDS
).start();
}
}

protected void refreshDomain() {
Expand Down
10 changes: 10 additions & 0 deletions ...y/registry-local/src/test/java/com/alipay/sofa/rpc/registry/local/DomainRegistryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.alipay.sofa.rpc.client.ProviderHelper;
import com.alipay.sofa.rpc.client.ProviderInfo;
import com.alipay.sofa.rpc.common.RpcConstants;
import com.alipay.sofa.rpc.common.struct.ScheduledService;
import com.alipay.sofa.rpc.config.ConsumerConfig;
import com.alipay.sofa.rpc.config.ProviderConfig;
import com.alipay.sofa.rpc.config.RegistryConfig;
Expand Down Expand Up @@ -67,6 +68,15 @@ public void testInit() {
assertTrue(domainRegistry.scheduledExecutorService.isStarted());
}

@Test
public void testInitOnce() {
DomainRegistry domainRegistry = new DomainRegistry(new RegistryConfig());
domainRegistry.init();
ScheduledService origin = domainRegistry.scheduledExecutorService;
domainRegistry.init();
assertSame(origin, domainRegistry.scheduledExecutorService);
}

@Test
public void testDirectUrl2IpUrl() {
ProviderInfo providerInfo = ProviderHelper.toProviderInfo("bolt://alipay.com:12200");
Expand Down