msb-public
/
spring-cloud-tencent
mirror of https://github.com/Tencent/spring-cloud-tencent
3
1
Code Issues Projects Releases Wiki Activity

fix: fix test case unstable issues

Browse Source
pull/1324/head
andrew shan 1 year ago
parent fc0192f0db
commit f1e98db84f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspectTest.java
Unescape View File

@ -141,7 +141,7 @@ public class LosslessRegistryAspectTest {
assertThat(OkHttpUtil.checkUrl(HOST, LOSSLESS_PORT_1, "/online", Collections.EMPTY_MAP)).isFalse(); assertThat(OkHttpUtil.checkUrl(HOST, LOSSLESS_PORT_1, "/online", Collections.EMPTY_MAP)).isFalse();
}).doesNotThrowAnyException(); }).doesNotThrowAnyException();
// delay register after 5s // delay register after 5s
Thread.sleep(5000); Thread.sleep(10000);
PolarisServiceRegistry registry = context.getBean(PolarisServiceRegistry.class); PolarisServiceRegistry registry = context.getBean(PolarisServiceRegistry.class);
PolarisRegistration registration = context.getBean(PolarisRegistration.class); PolarisRegistration registration = context.getBean(PolarisRegistration.class);

15
spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisSDKContextManager.java
Unescape View File

@ -22,6 +22,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import com.tencent.cloud.polaris.context.config.PolarisContextProperties; import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
import com.tencent.polaris.api.config.Configuration;
import com.tencent.polaris.api.control.Destroyable; import com.tencent.polaris.api.control.Destroyable;
import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ConsumerAPI;
import com.tencent.polaris.api.core.LosslessAPI; import com.tencent.polaris.api.core.LosslessAPI;
@ -229,9 +230,10 @@ public class PolarisSDKContextManager {
} }
} }
// init SDKContext // init SDKContext
serviceSdkContext = SDKContext.initContextByConfig(properties.configuration(serviceModifierList, Configuration configuration = properties.configuration(serviceModifierList,
() -> environment.getProperty("spring.cloud.client.ip-address"), () -> environment.getProperty("spring.cloud.client.ip-address"),
() -> environment.getProperty("spring.cloud.polaris.local-port", Integer.class, 0))); () -> environment.getProperty("spring.cloud.polaris.local-port", Integer.class, 0));
serviceSdkContext = SDKContext.initContextByConfig(configuration);
serviceSdkContext.init(); serviceSdkContext.init();
// init ProviderAPI // init ProviderAPI
@ -269,7 +271,7 @@ public class PolarisSDKContextManager {
} }
} }
})); }));
LOG.info("create Polaris SDK context successfully. properties: {}, ", properties); LOG.info("create Polaris SDK context successfully. properties: {}, configuration: {}", properties, configuration);
} }
catch (Throwable throwable) { catch (Throwable throwable) {
LOG.error("create Polaris SDK context failed. properties: {}, ", properties, throwable); LOG.error("create Polaris SDK context failed. properties: {}, ", properties, throwable);
@ -289,14 +291,15 @@ public class PolarisSDKContextManager {
if (null == configSDKContext && CollectionUtils.isNotEmpty(configModifierList)) { if (null == configSDKContext && CollectionUtils.isNotEmpty(configModifierList)) {
try { try {
// init config SDKContext // init config SDKContext
configSDKContext = SDKContext.initContextByConfig(properties.configuration(configModifierList, Configuration configuration = properties.configuration(configModifierList,
() -> environment.getProperty("spring.cloud.client.ip-address"), () -> environment.getProperty("spring.cloud.client.ip-address"),
() -> environment.getProperty("spring.cloud.polaris.local-port", Integer.class, 0))); () -> environment.getProperty("spring.cloud.polaris.local-port", Integer.class, 0));
configSDKContext = SDKContext.initContextByConfig(configuration);
configSDKContext.init(); configSDKContext.init();
// add shutdown hook // add shutdown hook
Runtime.getRuntime().addShutdownHook(new Thread(PolarisSDKContextManager::innerConfigDestroy)); Runtime.getRuntime().addShutdownHook(new Thread(PolarisSDKContextManager::innerConfigDestroy));
LOG.info("create Polaris config SDK context successfully. properties: {}, ", properties); LOG.info("create Polaris config SDK context successfully. properties: {}, configuration: {}", properties, configuration);
} }
catch (Throwable throwable) { catch (Throwable throwable) {
LOG.error("create Polaris config SDK context failed. properties: {}, ", properties, throwable); LOG.error("create Polaris config SDK context failed. properties: {}, ", properties, throwable);

Write Preview
Loading…
Cancel
Save