headers = new HashMap<>();
- authHeaderProviders.forEach(provider -> headers.putAll(provider.authHeaders()));
+ authHeaderProviders.forEach(provider -> headers.putAll(provider.authHeaders(host)));
return headers;
};
}
- private KieAddressManager configKieAddressManager(KieConfig kieConfig) {
+ private KieAddressManager configKieAddressManager(KieConfig kieConfig, Environment environment) {
+ String region = environment.getProperty("servicecomb.datacenter.region");
+ String availableZone = environment.getProperty("servicecomb.datacenter.availableZone");
return new KieAddressManager(
- Arrays.asList(kieConfig.getServerUri().split(",")), EventManager.getEventBus());
+ Arrays.asList(kieConfig.getServerUri().split(",")), EventManager.getEventBus(), region, availableZone);
}
@Override
diff --git a/dynamic-config/config-nacos/pom.xml b/dynamic-config/config-nacos/pom.xml
index b378d27ce45..395603f9fd6 100644
--- a/dynamic-config/config-nacos/pom.xml
+++ b/dynamic-config/config-nacos/pom.xml
@@ -22,7 +22,7 @@
dynamic-config
org.apache.servicecomb
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
4.0.0
config-nacos
diff --git a/dynamic-config/config-zookeeper/pom.xml b/dynamic-config/config-zookeeper/pom.xml
index 767d3a4649f..35fabec9591 100644
--- a/dynamic-config/config-zookeeper/pom.xml
+++ b/dynamic-config/config-zookeeper/pom.xml
@@ -22,7 +22,7 @@
dynamic-config
org.apache.servicecomb
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
4.0.0
config-zookeeper
diff --git a/dynamic-config/pom.xml b/dynamic-config/pom.xml
index 540381370f9..d5777cd654c 100644
--- a/dynamic-config/pom.xml
+++ b/dynamic-config/pom.xml
@@ -23,7 +23,7 @@
org.apache.servicecomb
java-chassis-parent
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
../parents/default
4.0.0
@@ -38,6 +38,7 @@
config-kie
config-zookeeper
config-etcd
+ config-consul
diff --git a/edge/edge-core/pom.xml b/edge/edge-core/pom.xml
index e270e5abf6d..0a75f8e33c6 100644
--- a/edge/edge-core/pom.xml
+++ b/edge/edge-core/pom.xml
@@ -22,7 +22,7 @@
org.apache.servicecomb
edge
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
edge-core
Java Chassis::Edge::Core
diff --git a/edge/pom.xml b/edge/pom.xml
index d75f7db7d5a..e11f4e088b6 100644
--- a/edge/pom.xml
+++ b/edge/pom.xml
@@ -22,7 +22,7 @@
org.apache.servicecomb
java-chassis-parent
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
../parents/default
edge
diff --git a/foundations/foundation-common/pom.xml b/foundations/foundation-common/pom.xml
index 3e07a454296..2f5a18878b4 100644
--- a/foundations/foundation-common/pom.xml
+++ b/foundations/foundation-common/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.apache.servicecomb
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
foundations
foundation-common
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/cache/VersionedCache.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/cache/VersionedCache.java
index 6580174861e..b30e13862b4 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/cache/VersionedCache.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/cache/VersionedCache.java
@@ -30,7 +30,7 @@ interface IsEmpty {
boolean isEmpty();
}
- protected int cacheVersion;
+ protected volatile int cacheVersion;
// an optional name
protected String name;
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/IpPort.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/IpPort.java
index d8515eea13a..66aae3ebca7 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/IpPort.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/IpPort.java
@@ -22,9 +22,9 @@
import com.google.common.base.Objects;
public class IpPort {
- private String hostOrIp;
+ private volatile String hostOrIp;
- private int port;
+ private volatile int port;
private volatile InetSocketAddress socketAddress;
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/GenericsUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/GenericsUtils.java
index 0429b82da70..d872236082e 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/GenericsUtils.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/GenericsUtils.java
@@ -24,14 +24,14 @@ public final class GenericsUtils {
/**
* check if XXX.class is generic type. see TestGenericsUtils for details meaning.
* This method is provided for API compatibility for RestTemplate. Following code:
- *
- *
+ *
+ *{@code
* List>> response = consumers.getSCBRestTemplate()
* postForObject("/testListObjectParam", request, List.class);
- *
+ * }
*
* should work for versions of 1.*. This is because java-chassis can read type info from swaggers.
- *
+ *
* Start from 2.x, the best practise to write this code is to use ParameterizedTypeReference provided by RestTemplate
* exchange method.
*/
diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java
index 184431d8dd7..736a933159b 100644
--- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java
+++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/event/TestEventManager.java
@@ -48,7 +48,7 @@ public void normalListener() {
test(this);
Assertions.assertTrue(collector.getEvents().isEmpty()); // ensure no warning logs
- collector.teardown();
+ collector.tearDown();
}
@Test
@@ -72,7 +72,7 @@ void onInt(Integer obj) {
Assertions.assertTrue(true);
}
- collector.teardown();
+ collector.tearDown();
}
@Test
@@ -98,7 +98,7 @@ public void onInt(Integer obj) {
// ensure logs: "LOGGER.warn("Failed to create lambda for method: {}, fallback to reflect.", method, throwable);"
Assertions.assertFalse(collector.getEvents().isEmpty());
- collector.teardown();
+ collector.tearDown();
}
@Subscribe
diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
index 89da7bd52b3..10054efe4e8 100644
--- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
+++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestJvmUtils.java
@@ -56,7 +56,7 @@ public void findMainClass_invalid() {
Assertions.assertNull(JvmUtils.findMainClass());
Assertions.assertEquals("\"invalidCls\" is not a valid class.", logCollector.getEvents().get(0).getMessage());
- logCollector.teardown();
+ logCollector.tearDown();
}
@Test
diff --git a/foundations/foundation-config/pom.xml b/foundations/foundation-config/pom.xml
index 14629e95a32..12c4a54c5be 100644
--- a/foundations/foundation-config/pom.xml
+++ b/foundations/foundation-config/pom.xml
@@ -21,7 +21,7 @@
foundations
org.apache.servicecomb
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
4.0.0
diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicPropertiesImpl.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicPropertiesImpl.java
index 84f623d74d9..323e84d80aa 100644
--- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicPropertiesImpl.java
+++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/DynamicPropertiesImpl.java
@@ -17,11 +17,11 @@
package org.apache.servicecomb.config;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
import java.util.function.DoubleConsumer;
import java.util.function.IntConsumer;
@@ -44,17 +44,17 @@ private static class Holder {
}
}
- private final Map, String>>> stringCallbacks = new HashMap<>();
+ private final Map, String>>> stringCallbacks = new ConcurrentHashMap<>();
- private final Map>> intCallbacks = new HashMap<>();
+ private final Map>> intCallbacks = new ConcurrentHashMap<>();
- private final Map>> longCallbacks = new HashMap<>();
+ private final Map>> longCallbacks = new ConcurrentHashMap<>();
- private final Map>> floatCallbacks = new HashMap<>();
+ private final Map>> floatCallbacks = new ConcurrentHashMap<>();
- private final Map>> doubleCallbacks = new HashMap<>();
+ private final Map>> doubleCallbacks = new ConcurrentHashMap<>();
- private final Map, Boolean>>> booleanCallbacks = new HashMap<>();
+ private final Map, Boolean>>> booleanCallbacks = new ConcurrentHashMap<>();
private final Environment environment;
diff --git a/foundations/foundation-metrics/pom.xml b/foundations/foundation-metrics/pom.xml
index cce230c8948..d893011c4d4 100644
--- a/foundations/foundation-metrics/pom.xml
+++ b/foundations/foundation-metrics/pom.xml
@@ -21,7 +21,7 @@
org.apache.servicecomb
foundations
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
foundation-metrics
Java Chassis::Foundations::Metrics
diff --git a/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/publish/spectator/TestMeasurementGroupConfig.java b/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/publish/spectator/TestMeasurementGroupConfig.java
index b4637386720..60d77b4c75a 100644
--- a/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/publish/spectator/TestMeasurementGroupConfig.java
+++ b/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/publish/spectator/TestMeasurementGroupConfig.java
@@ -53,7 +53,7 @@ public void addGroup() {
config.addGroup("id1", "tag1.1", "tag1.2");
config.addGroup("id2", "tag2.1", "tag2.2");
- MatcherAssert.assertThat(groups.keySet(), Matchers.contains("id2", "id1"));
+ MatcherAssert.assertThat(groups.keySet(), Matchers.containsInAnyOrder("id2", "id1"));
MatcherAssert.assertThat(groups.get("id1").stream().map(TagFinder::getTagKey).toArray(), Matchers.arrayContaining("tag1.1", "tag1.2"));
MatcherAssert.assertThat(groups.get("id2").stream().map(TagFinder::getTagKey).toArray(), Matchers.arrayContaining("tag2.1", "tag2.2"));
}
diff --git a/foundations/foundation-protobuf/pom.xml b/foundations/foundation-protobuf/pom.xml
index e58e0ad8242..cb8662c7bfb 100644
--- a/foundations/foundation-protobuf/pom.xml
+++ b/foundations/foundation-protobuf/pom.xml
@@ -21,7 +21,7 @@
foundations
org.apache.servicecomb
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
4.0.0
diff --git a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/SchemaManager.java b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/SchemaManager.java
index 331c6b63284..5d583954ca0 100644
--- a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/SchemaManager.java
+++ b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/schema/SchemaManager.java
@@ -166,14 +166,14 @@ public FieldMapEx> createMapFields(Message message, Map types, String perameterName) {
+ private JavaType getParameterType(Map types, String parameterName) {
- if (types.get(perameterName) != null) {
- return TypeFactory.defaultInstance().constructType(types.get(perameterName));
+ if (types.get(parameterName) != null) {
+ return TypeFactory.defaultInstance().constructType(types.get(parameterName));
}
throw new IllegalArgumentException(
- String.format("not found type info for parameter name [%s]", perameterName));
+ String.format("not found type info for parameter name [%s]", parameterName));
}
public FieldSchema createSchemaField(Field protoField, PropertyDescriptor propertyDescriptor) {
diff --git a/foundations/foundation-registry/pom.xml b/foundations/foundation-registry/pom.xml
index 7e78cd937a4..d4cca8111c4 100644
--- a/foundations/foundation-registry/pom.xml
+++ b/foundations/foundation-registry/pom.xml
@@ -21,7 +21,7 @@
foundations
org.apache.servicecomb
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
4.0.0
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java
index 2cbe83a2465..edcd3b3caef 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java
@@ -183,7 +183,7 @@ private VersionedCache calcAvailableInstance(String application, String serviceN
continue;
}
if (instance.getHistoryStatus() == HistoryStatus.HISTORY
- && instance.getMicroserviceInstanceStatus() == MicroserviceInstanceStatus.UP
+ && instance.getStatus() == MicroserviceInstanceStatus.UP
&& instance.getPingStatus() == PingStatus.OK
&& instance.getIsolationStatus() == IsolationStatus.NORMAL) {
result.add(instance);
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java
index 0639d00f401..9c135d380c8 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java
@@ -24,6 +24,7 @@
import java.util.stream.Collectors;
import org.apache.servicecomb.foundation.common.utils.LambdaUtils;
+import org.apache.servicecomb.foundation.common.utils.SPIEnabled;
import org.apache.servicecomb.registry.api.LifeCycle;
import org.apache.servicecomb.registry.api.MicroserviceInstanceStatus;
import org.apache.servicecomb.registry.api.Registration;
@@ -40,7 +41,7 @@ public RegistrationManager(List> re
this.registrationList = Collections.emptyList();
return;
}
- this.registrationList = registrationList;
+ this.registrationList = registrationList.stream().filter(SPIEnabled::enabled).collect(Collectors.toList());
}
/**
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/MicroserviceInstance.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/MicroserviceInstance.java
index 0dd6d0237c0..c5c872beefd 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/MicroserviceInstance.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/MicroserviceInstance.java
@@ -93,4 +93,10 @@ public interface MicroserviceInstance {
default String getServiceId() {
return "";
}
+
+ /**
+ * Service status(Required): status of this microservice.
+ *
+ */
+ MicroserviceInstanceStatus getStatus();
}
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Registration.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Registration.java
index c5529619f56..014da5f147b 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Registration.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Registration.java
@@ -22,42 +22,42 @@
/**
- * This is the core service registration interface.
+ * This is the core service registration interface.
*/
public interface Registration extends SPIEnabled, SPIOrder, LifeCycle {
String name();
/**
- * get MicroserviceInstance
- *
+ * get MicroserviceInstance
+ *
* Life Cycle：This method is called anytime after run.
*/
R getMicroserviceInstance();
/**
- * update MicroserviceInstance status
- *
+ * update MicroserviceInstance status
+ *
* Life Cycle：This method is called anytime after run.
*/
boolean updateMicroserviceInstanceStatus(MicroserviceInstanceStatus status);
/**
- * adding schemas to Microservice
- *
+ * adding schemas to Microservice
+ *
* Life Cycle：This method is called after init and before run.
*/
void addSchema(String schemaId, String content);
/**
- * adding endpoints to MicroserviceInstance
- *
+ * adding endpoints to MicroserviceInstance
+ *
* Life Cycle：This method is called after init and before run.
*/
void addEndpoint(String endpoint);
/**
- * adding property to MicroserviceInstance
- *
+ * adding property to MicroserviceInstance
+ *
* Life Cycle：This method is called after init and before run.
*/
void addProperty(String key, String value);
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/RegistrationInstance.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/RegistrationInstance.java
index afe2bc7a878..a7d7cafda88 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/RegistrationInstance.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/RegistrationInstance.java
@@ -20,15 +20,4 @@
* Microserivce instance registration object.
*/
public interface RegistrationInstance extends MicroserviceInstance {
- /**
- * Initial status when registering(Optional). This method is
- * implementation specific and may be not used.
- */
- MicroserviceInstanceStatus getInitialStatus();
-
- /**
- * Ready status when microservice instance is ready for service(Optional).This method is
- * implementation specific and may be not used.
- */
- MicroserviceInstanceStatus getReadyStatus();
}
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/AbstractDiscoveryFilter.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/AbstractDiscoveryFilter.java
index 5883ec51bf3..f274799c30e 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/AbstractDiscoveryFilter.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/AbstractDiscoveryFilter.java
@@ -19,19 +19,21 @@
import java.util.ArrayList;
+import org.apache.servicecomb.config.DynamicProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
public abstract class AbstractDiscoveryFilter implements DiscoveryFilter {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractDiscoveryFilter.class);
- protected Environment environment;
+ protected Boolean enabled;
+
+ protected DynamicProperties dynamicProperties;
@Autowired
- public void setEnvironment(Environment environment) {
- this.environment = environment;
+ public void setDynamicProperties(DynamicProperties dynamicProperties) {
+ this.dynamicProperties = dynamicProperties;
}
@Override
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTreeNode.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTreeNode.java
index 3dda15f6c4b..e0f7c828c10 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTreeNode.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTreeNode.java
@@ -25,7 +25,7 @@
public class DiscoveryTreeNode extends VersionedCache {
private volatile boolean childrenInited;
- private int level;
+ private volatile int level;
protected Map attributes = new ConcurrentHashMapEx<>();
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/InstanceStatusDiscoveryFilter.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/InstanceStatusDiscoveryFilter.java
index ef60b4a3eff..e7a4029bdeb 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/InstanceStatusDiscoveryFilter.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/InstanceStatusDiscoveryFilter.java
@@ -32,6 +32,8 @@ public class InstanceStatusDiscoveryFilter extends AbstractGroupDiscoveryFilter
public static final String GROUP_SIZE = "status_group_size";
+ public static final String SERVICECOMB_LOADBALANCE_FILTER_STATUS_ENABLED = "servicecomb.loadbalance.filter.status.enabled";
+
@Override
public int getOrder() {
return -10000;
@@ -39,7 +41,13 @@ public int getOrder() {
@Override
public boolean enabled() {
- return environment.getProperty("servicecomb.loadbalance.filter.status.enabled", Boolean.class, true);
+
+ if (enabled == null) {
+ enabled = dynamicProperties.getBooleanProperty(SERVICECOMB_LOADBALANCE_FILTER_STATUS_ENABLED,
+ value -> enabled = value,
+ true);
+ }
+ return enabled;
}
@Override
@@ -69,21 +77,21 @@ public void init(DiscoveryContext context, DiscoveryTreeNode parent) {
for (StatefulDiscoveryInstance instance : instances) {
if (HistoryStatus.CURRENT == instance.getHistoryStatus() &&
- MicroserviceInstanceStatus.UP == instance.getMicroserviceInstanceStatus() &&
+ MicroserviceInstanceStatus.UP == instance.getStatus() &&
PingStatus.OK == instance.getPingStatus() &&
IsolationStatus.NORMAL == instance.getIsolationStatus()) {
level0.add(instance);
continue;
}
if (HistoryStatus.CURRENT == instance.getHistoryStatus() &&
- MicroserviceInstanceStatus.UP == instance.getMicroserviceInstanceStatus() &&
+ MicroserviceInstanceStatus.UP == instance.getStatus() &&
PingStatus.UNKNOWN == instance.getPingStatus() &&
IsolationStatus.NORMAL == instance.getIsolationStatus()) {
level1.add(instance);
continue;
}
if (HistoryStatus.HISTORY == instance.getHistoryStatus() &&
- MicroserviceInstanceStatus.UP == instance.getMicroserviceInstanceStatus() &&
+ MicroserviceInstanceStatus.UP == instance.getStatus() &&
PingStatus.OK == instance.getPingStatus() &&
IsolationStatus.NORMAL == instance.getIsolationStatus()) {
level2.add(instance);
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/StatefulDiscoveryInstance.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/StatefulDiscoveryInstance.java
index f06ea936d20..394b2b03ccc 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/StatefulDiscoveryInstance.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/StatefulDiscoveryInstance.java
@@ -46,8 +46,6 @@ public enum HistoryStatus {
private final DiscoveryInstance discoveryInstance;
- private MicroserviceInstanceStatus microserviceInstanceStatus = MicroserviceInstanceStatus.UP;
-
private IsolationStatus isolationStatus = IsolationStatus.NORMAL;
private long isolatedTime;
@@ -64,15 +62,6 @@ public StatefulDiscoveryInstance(DiscoveryInstance discoveryInstance) {
this.discoveryInstance = discoveryInstance;
}
- public MicroserviceInstanceStatus getMicroserviceInstanceStatus() {
- return microserviceInstanceStatus;
- }
-
- public void setMicroserviceInstanceStatus(
- MicroserviceInstanceStatus microserviceInstanceStatus) {
- this.microserviceInstanceStatus = microserviceInstanceStatus;
- }
-
public IsolationStatus getIsolationStatus() {
return isolationStatus;
}
diff --git a/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java
index a30b892f8b4..d726d1b59c0 100644
--- a/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java
+++ b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java
@@ -24,6 +24,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.servicecomb.config.DynamicProperties;
import org.apache.servicecomb.foundation.common.cache.VersionedCache;
import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.apache.servicecomb.registry.DiscoveryManager;
@@ -32,7 +33,6 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.springframework.core.env.Environment;
public class TestDiscoveryTree {
DiscoveryContext context = new DiscoveryContext();
@@ -238,11 +238,12 @@ public void test_one_service_concurrent_correct() throws Exception {
DiscoveryTree discoveryTree = new DiscoveryTree(discoveryManager);
DiscoveryContext discoveryContext = new DiscoveryContext();
InstanceStatusDiscoveryFilter filter = new InstanceStatusDiscoveryFilter();
- Environment environment = Mockito.mock(Environment.class);
- Mockito.when(environment
- .getProperty("servicecomb.loadbalance.filter.status.enabled", Boolean.class, true))
+ DynamicProperties dynamicProperties = Mockito.mock(DynamicProperties.class);
+ Mockito.when(dynamicProperties.getBooleanProperty(Mockito.eq("servicecomb.loadbalance.filter.status.enabled"),
+ Mockito.any(),
+ Mockito.eq(true)))
.thenReturn(true);
- filter.setEnvironment(environment);
+ filter.setDynamicProperties(dynamicProperties);
discoveryTree.setDiscoveryFilters(List.of(filter));
StatefulDiscoveryInstance instance1 = Mockito.mock(StatefulDiscoveryInstance.class);
diff --git a/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestInstanceStatusDiscoveryFilter.java b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestInstanceStatusDiscoveryFilter.java
index eeecc420096..8e7307098b9 100644
--- a/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestInstanceStatusDiscoveryFilter.java
+++ b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestInstanceStatusDiscoveryFilter.java
@@ -36,22 +36,22 @@ public void test_all_group_correct_init() {
List instances = new ArrayList<>();
StatefulDiscoveryInstance instance1 = Mockito.mock(StatefulDiscoveryInstance.class);
Mockito.when(instance1.getHistoryStatus()).thenReturn(HistoryStatus.CURRENT);
- Mockito.when(instance1.getMicroserviceInstanceStatus()).thenReturn(MicroserviceInstanceStatus.UP);
+ Mockito.when(instance1.getStatus()).thenReturn(MicroserviceInstanceStatus.UP);
Mockito.when(instance1.getPingStatus()).thenReturn(PingStatus.OK);
Mockito.when(instance1.getIsolationStatus()).thenReturn(IsolationStatus.NORMAL);
StatefulDiscoveryInstance instance2 = Mockito.mock(StatefulDiscoveryInstance.class);
Mockito.when(instance2.getHistoryStatus()).thenReturn(HistoryStatus.CURRENT);
- Mockito.when(instance2.getMicroserviceInstanceStatus()).thenReturn(MicroserviceInstanceStatus.UP);
+ Mockito.when(instance2.getStatus()).thenReturn(MicroserviceInstanceStatus.UP);
Mockito.when(instance2.getPingStatus()).thenReturn(PingStatus.UNKNOWN);
Mockito.when(instance2.getIsolationStatus()).thenReturn(IsolationStatus.NORMAL);
StatefulDiscoveryInstance instance3 = Mockito.mock(StatefulDiscoveryInstance.class);
Mockito.when(instance3.getHistoryStatus()).thenReturn(HistoryStatus.HISTORY);
- Mockito.when(instance3.getMicroserviceInstanceStatus()).thenReturn(MicroserviceInstanceStatus.UP);
+ Mockito.when(instance3.getStatus()).thenReturn(MicroserviceInstanceStatus.UP);
Mockito.when(instance3.getPingStatus()).thenReturn(PingStatus.OK);
Mockito.when(instance3.getIsolationStatus()).thenReturn(IsolationStatus.NORMAL);
StatefulDiscoveryInstance instance4 = Mockito.mock(StatefulDiscoveryInstance.class);
Mockito.when(instance4.getHistoryStatus()).thenReturn(HistoryStatus.CURRENT);
- Mockito.when(instance4.getMicroserviceInstanceStatus()).thenReturn(MicroserviceInstanceStatus.UP);
+ Mockito.when(instance4.getStatus()).thenReturn(MicroserviceInstanceStatus.UP);
Mockito.when(instance4.getPingStatus()).thenReturn(PingStatus.FAIL);
Mockito.when(instance4.getIsolationStatus()).thenReturn(IsolationStatus.NORMAL);
instances.addAll(Arrays.asList(instance1, instance2, instance3, instance4));
diff --git a/foundations/foundation-registry/src/test/resources/log4j2.xml b/foundations/foundation-registry/src/test/resources/log4j2.xml
index 8cee07220ec..3125ebd11e4 100644
--- a/foundations/foundation-registry/src/test/resources/log4j2.xml
+++ b/foundations/foundation-registry/src/test/resources/log4j2.xml
@@ -16,14 +16,14 @@
under the License.
-->
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/foundations/foundation-spi/pom.xml b/foundations/foundation-spi/pom.xml
index 0f58fc313ac..aa38214b3ee 100644
--- a/foundations/foundation-spi/pom.xml
+++ b/foundations/foundation-spi/pom.xml
@@ -21,7 +21,7 @@
org.apache.servicecomb
foundations
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
foundation-spi
Java Chassis::Foundations::SSL
diff --git a/foundations/foundation-spi/src/main/java/org/apache/servicecomb/foundation/auth/AuthHeaderProvider.java b/foundations/foundation-spi/src/main/java/org/apache/servicecomb/foundation/auth/AuthHeaderProvider.java
index 313c19ee5ba..0e036e21a58 100644
--- a/foundations/foundation-spi/src/main/java/org/apache/servicecomb/foundation/auth/AuthHeaderProvider.java
+++ b/foundations/foundation-spi/src/main/java/org/apache/servicecomb/foundation/auth/AuthHeaderProvider.java
@@ -21,11 +21,21 @@
import java.util.Map;
public interface AuthHeaderProvider {
- default Map authHeaders() {
+ /**
+ * Obtain RBAC authentication request header, host is the key of cache
+ *
+ * @param host engine address ip
+ * @return auth headers
+ */
+ default Map authHeaders(String host) {
return new HashMap<>(0);
}
default Map getSignAuthHeaders(SignRequest request) {
- return authHeaders();
+ String host = "";
+ if (request != null && request.getEndpoint() != null) {
+ host = request.getEndpoint().getHost();
+ }
+ return authHeaders(host);
}
}
diff --git a/foundations/foundation-ssl/pom.xml b/foundations/foundation-ssl/pom.xml
index 2e2225ad3a8..3cf7cdcb485 100644
--- a/foundations/foundation-ssl/pom.xml
+++ b/foundations/foundation-ssl/pom.xml
@@ -21,7 +21,7 @@
org.apache.servicecomb
foundations
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
foundation-ssl
Java Chassis::Foundations::SSL
diff --git a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java
index f7d046f6562..54955139087 100644
--- a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java
+++ b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java
@@ -26,13 +26,12 @@
import java.security.cert.CertificateFactory;
import java.util.Collection;
-import org.apache.commons.lang3.SystemUtils;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
-import org.mockito.Mockito;
import mockit.Mock;
import mockit.MockUp;
+import org.mockito.Mockito;
public class KeyStoreUtilTest {
final String strFilePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
@@ -78,14 +77,9 @@ public void testCreateKeyManagersException() {
try {
KeyStoreUtil.createKeyManagers(keystore, storeKeyValue);
} catch (IllegalArgumentException e) {
- if (SystemUtils.JAVA_SPECIFICATION_VERSION.startsWith("17")) {
Assertions.assertEquals("Bad key store.Get Key failed:"
+ " Cannot read the array length because \"password\" is null",
e.getMessage());
- } else {
- Assertions.assertEquals("Bad key store.Get Key failed: null",
- e.getMessage());
- }
}
}
diff --git a/foundations/foundation-test-scaffolding/pom.xml b/foundations/foundation-test-scaffolding/pom.xml
index b5c048ed5d7..f3feba62148 100644
--- a/foundations/foundation-test-scaffolding/pom.xml
+++ b/foundations/foundation-test-scaffolding/pom.xml
@@ -21,7 +21,7 @@
org.apache.servicecomb
foundations
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
foundation-test-scaffolding
Java Chassis::Foundations::Test Scaffolding
diff --git a/foundations/foundation-test-scaffolding/src/main/java/io/vertx/core/impl/SyncContext.java b/foundations/foundation-test-scaffolding/src/main/java/io/vertx/core/impl/SyncContext.java
deleted file mode 100644
index ec50fc1b6c1..00000000000
--- a/foundations/foundation-test-scaffolding/src/main/java/io/vertx/core/impl/SyncContext.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.vertx.core.impl;
-
-import java.io.Serial;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-import io.netty.channel.EventLoop;
-import io.vertx.codegen.annotations.Nullable;
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Context;
-import io.vertx.core.Future;
-import io.vertx.core.Handler;
-import io.vertx.core.Promise;
-import io.vertx.core.ThreadingModel;
-import io.vertx.core.json.JsonObject;
-import io.vertx.core.spi.tracing.VertxTracer;
-
-/**
- * This class is created to make vertx unit test easier
- */
-@SuppressWarnings({"rawtypes"})
-public class SyncContext extends ContextBase implements ContextInternal {
- @Serial
- private static final long serialVersionUID = -6209656149925076980L;
-
- protected VertxInternal owner;
-
- protected Executor executor = Executors.newSingleThreadExecutor();
-
- public SyncContext() {
- this(0);
- }
-
- public SyncContext(int localsLength) {
- super(localsLength);
- }
-
- @Override
- public VertxInternal owner() {
- return owner;
- }
-
- @Override
- public Context exceptionHandler(@Nullable Handler handler) {
- return null;
- }
-
- @Override
- public @Nullable Handler exceptionHandler() {
- return null;
- }
-
- @Override
- public boolean inThread() {
- return false;
- }
-
- @Override
- public void emit(T t, Handler handler) {
-
- }
-
- @Override
- public void execute(Runnable runnable) {
-
- }
-
- @Override
- public void execute(T t, Handler handler) {
-
- }
-
- @Override
- public Future close() {
- return Future.succeededFuture();
- }
-
- @Override
- public void reportException(Throwable throwable) {
-
- }
-
- @Override
- public ConcurrentMap contextData() {
- return null;
- }
-
- @Override
- public ClassLoader classLoader() {
- return null;
- }
-
- @Override
- public WorkerPool workerPool() {
- return null;
- }
-
- @Override
- public VertxTracer tracer() {
- return null;
- }
-
- @Override
- public ContextInternal duplicate() {
- return null;
- }
-
- @Override
- public CloseFuture closeFuture() {
- return null;
- }
-
- public void setOwner(VertxInternal owner) {
- this.owner = owner;
- }
-
-
- public static void syncExecuteBlocking(Handler> blockingCodeHandler,
- Handler> asyncResultHandler) {
- Promise res = Promise.promise();
-
- try {
- blockingCodeHandler.handle(res);
- } catch (Throwable e) {
- res.fail(e);
- return;
- }
-
- res.future().onComplete(asyncResultHandler);
- }
-
- private static Future syncExecuteBlocking(Handler> blockingCodeHandler) {
- Promise res = Promise.promise();
-
- try {
- blockingCodeHandler.handle(res);
- } catch (Throwable e) {
- res.fail(e);
- return res.future();
- }
-
- return res.future();
- }
-
- @Override
- public Future executeBlockingInternal(Handler> action) {
- return syncExecuteBlocking(action);
- }
-
- @Override
- public Future executeBlockingInternal(Callable callable) {
- return null;
- }
-
- @Override
- public Future executeBlockingInternal(Handler> handler, boolean b) {
- return null;
- }
-
- @Override
- public Future executeBlockingInternal(Callable callable, boolean b) {
- return null;
- }
-
- @Override
- public Deployment getDeployment() {
- return null;
- }
-
- @Override
- public Executor executor() {
- return executor;
- }
-
- @Override
- public EventLoop nettyEventLoop() {
- return null;
- }
-
- @Override
- @Deprecated
- public Future executeBlocking(Handler> handler, TaskQueue taskQueue) {
- return null;
- }
-
- @Override
- public Future executeBlocking(Callable callable, TaskQueue taskQueue) {
- return null;
- }
-
- @Override
- @Deprecated
- public void executeBlocking(Handler> blockingCodeHandler, boolean ordered,
- Handler> asyncResultHandler) {
- syncExecuteBlocking(blockingCodeHandler, asyncResultHandler);
- }
-
- @Override
- public Future<@Nullable T> executeBlocking(Callable callable, boolean b) {
- return null;
- }
-
- @Override
- @Deprecated
- public Future<@Nullable T> executeBlocking(Handler> handler, boolean b) {
- return null;
- }
-
- @Override
- public @Nullable JsonObject config() {
- return null;
- }
-
- @Override
- public boolean isEventLoopContext() {
- return false;
- }
-
- @Override
- public boolean isWorkerContext() {
- return false;
- }
-
- @Override
- public ThreadingModel threadingModel() {
- return null;
- }
-}
diff --git a/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/log/LogCollector.java b/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/log/LogCollector.java
index a01032939ec..5b435b89829 100644
--- a/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/log/LogCollector.java
+++ b/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/log/LogCollector.java
@@ -35,17 +35,22 @@
public class LogCollector implements Closeable {
List events = new ArrayList<>();
- Appender appender = new AbstractAppender("LogCollector", null, PatternLayout.createDefaultLayout(), true,
- Property.EMPTY_ARRAY) {
- @Override
- public void append(LogEvent event) {
- events.add(event);
- }
- };
+ Appender appender;
+
+ String appenderName;
public LogCollector() {
LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
Configuration config = ctx.getConfiguration();
+ appenderName = "LogCollector" + System.nanoTime();
+ appender = new AbstractAppender(appenderName, null, PatternLayout.createDefaultLayout(),
+ true,
+ Property.EMPTY_ARRAY) {
+ @Override
+ public void append(LogEvent event) {
+ events.add(event);
+ }
+ };
appender.start();
config.getRootLogger().addAppender(appender, Level.ALL, null);
ctx.updateLoggers(config);
@@ -84,11 +89,11 @@ public List getThrowableMessages() {
.collect(Collectors.toList());
}
- public void teardown() {
+ public void tearDown() {
LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
Configuration config = ctx.getConfiguration();
appender.stop();
- config.getRootLogger().removeAppender("LogCollector");
+ config.getRootLogger().removeAppender(appenderName);
ctx.updateLoggers(config);
}
@@ -98,6 +103,6 @@ public void clear() {
@Override
public void close() {
- teardown();
+ tearDown();
}
}
diff --git a/foundations/foundation-vertx/pom.xml b/foundations/foundation-vertx/pom.xml
index 921b0892414..24556f590f7 100644
--- a/foundations/foundation-vertx/pom.xml
+++ b/foundations/foundation-vertx/pom.xml
@@ -21,7 +21,7 @@
org.apache.servicecomb
foundations
- 3.3.0-SNAPSHOT
+ 3.4.0-SNAPSHOT
foundation-vertx
Java Chassis::Foundations::Vertx
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/AddressResolverConfig.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/AddressResolverConfig.java
index 8b99960be30..2d4ee389642 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/AddressResolverConfig.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/AddressResolverConfig.java
@@ -109,7 +109,7 @@ private static int getPositiveIntProperty(int defaultValue, String... keys) {
for (String key : keys) {
Integer val = LegacyPropertyFactory.getProperty(key, Integer.class);
if (val != null && val <= 0) {
- LOGGER.warn("Address resover key:{}'s value:{} is not positive, please check!", key, val);
+ LOGGER.warn("Address resolver key:{}'s value:{} is not positive, please check!", key, val);
continue;
}
if (val != null) {
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/SharedVertxFactory.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/SharedVertxFactory.java
index 9803582459c..9f2d3af797b 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/SharedVertxFactory.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/SharedVertxFactory.java
@@ -64,7 +64,7 @@ public static Vertx getSharedVertx(Environment environment) {
private static Vertx createSharedVertx(Environment environment, String name) {
SharedVertxInfo info = new SharedVertxInfo(environment);
- Vertx vertx = VertxUtils.init(name, info.vertxOptions);
+ Vertx vertx = VertxUtils.init(name, info.vertxOptions, info.metricsFactory);
info.metricsFactory.setVertx(vertx, info.vertxOptions);
vertx.sharedData().getLocalMap(LOCAL_MAP_NAME).put(INFO, info);
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
index 43094de2a35..5eceac0b24d 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
@@ -38,14 +38,17 @@
import io.netty.buffer.ByteBuf;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.DeploymentOptions;
+import io.vertx.core.Future;
import io.vertx.core.Verticle;
import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import io.vertx.core.buffer.Buffer;
-import io.vertx.core.file.impl.FileResolverImpl;
-import io.vertx.core.impl.VertxBuilder;
+import io.vertx.core.impl.SysProps;
import io.vertx.core.impl.VertxThread;
+import io.vertx.core.internal.VertxBootstrap;
+import io.vertx.core.spi.VertxMetricsFactory;
import io.vertx.core.spi.VertxThreadFactory;
+import io.vertx.core.transport.Transport;
/**
* VertxUtils
@@ -90,12 +93,13 @@ public static Map blockDeploy(Vertx
Map result = new HashMap<>();
CountDownLatch latch = new CountDownLatch(1);
- vertx.deployVerticle(cls.getName(), options, ar -> {
- result.put("code", ar.succeeded());
+ Future future = vertx.deployVerticle(cls.getName(), options);
+ future.onComplete((success, failure) -> {
+ result.put("code", failure == null);
- if (ar.failed()) {
- result.put("message", ar.cause().getMessage());
- LOGGER.error("deploy vertx failed, cause ", ar.cause());
+ if (failure != null) {
+ result.put("message", failure.getMessage());
+ LOGGER.error("deploy vertx failed, cause ", failure);
}
latch.countDown();
@@ -106,11 +110,12 @@ public static Map blockDeploy(Vertx
return result;
}
- public static Vertx getOrCreateVertxByName(String name, VertxOptions vertxOptions) {
- return vertxMap.computeIfAbsent(name, vertxName -> init(vertxName, vertxOptions));
+ public static Vertx getOrCreateVertxByName(String name, VertxOptions vertxOptions,
+ VertxMetricsFactory metricsFactory) {
+ return vertxMap.computeIfAbsent(name, vertxName -> init(name, vertxOptions, metricsFactory));
}
- public static Vertx init(String name, VertxOptions vertxOptions) {
+ public static Vertx init(String name, VertxOptions vertxOptions, VertxMetricsFactory metricsFactory) {
if (vertxOptions == null) {
vertxOptions = new VertxOptions();
}
@@ -123,14 +128,31 @@ public static Vertx init(String name, VertxOptions vertxOptions) {
configureVertxFileCaching(vertxOptions);
- return new VertxBuilder(vertxOptions).threadFactory(new VertxThreadFactory() {
- @Override
- public VertxThread newVertxThread(Runnable target, String threadName, boolean worker, long maxExecTime,
- TimeUnit maxExecTimeUnit) {
- return VertxThreadFactory.super
- .newVertxThread(target, name + "-" + threadName, worker, maxExecTime, maxExecTimeUnit);
- }
- }).init().vertx();
+ VertxBootstrap bootstrap = bootstrap(vertxOptions, metricsFactory)
+ .threadFactory(new VertxThreadFactory() {
+ @Override
+ public VertxThread newVertxThread(Runnable target, String threadName, boolean worker, long maxExecTime,
+ TimeUnit maxExecTimeUnit) {
+ return VertxThreadFactory.super
+ .newVertxThread(target, name + "-" + threadName, worker, maxExecTime, maxExecTimeUnit);
+ }
+ });
+
+ return bootstrap.init().vertx();
+ }
+
+ private static VertxBootstrap bootstrap(VertxOptions options, VertxMetricsFactory metricsFactory) {
+ VertxBootstrap bootstrap = VertxBootstrap.create();
+ bootstrap.options(options);
+ bootstrap.metricsFactory(metricsFactory);
+ Transport tr;
+ if (options.getPreferNativeTransport()) {
+ tr = Transport.nativeTransport();
+ } else {
+ tr = Transport.NIO;
+ }
+ bootstrap.transport(tr.implementation());
+ return bootstrap;
}
/**
@@ -138,7 +160,7 @@ public VertxThread newVertxThread(Runnable target, String threadName, boolean wo
*/
private static void configureVertxFileCaching(VertxOptions vertxOptions) {
boolean disableFileCPResolving = LegacyPropertyFactory
- .getBooleanProperty(FileResolverImpl.DISABLE_CP_RESOLVING_PROP_NAME, true);
+ .getBooleanProperty(SysProps.DISABLE_FILE_CP_RESOLVING.name, true);
vertxOptions.getFileSystemOptions().setClassPathResolvingEnabled(!disableFileCPResolving);
}
@@ -178,15 +200,17 @@ public static CompletableFuture closeVertxByName(String name) {
return future;
}
- vertx.close(ar -> {
- if (ar.succeeded()) {
+ Future closeFuture = vertx.close();
+ closeFuture.onComplete((succ, fail) -> {
+ if (fail == null) {
LOGGER.info("Success to close vertx {}.", name);
future.complete(null);
return;
}
- future.completeExceptionally(ar.cause());
+ future.completeExceptionally(fail);
});
+
return future;
}
@@ -201,8 +225,9 @@ public static void blockCloseVertxByName(String name) {
public static void blockCloseVertx(Vertx vertx) {
CountDownLatch latch = new CountDownLatch(1);
- vertx.close(ar -> {
- if (ar.succeeded()) {
+ Future closeFuture = vertx.close();
+ closeFuture.onComplete((succ, fail) -> {
+ if (fail == null) {
LOGGER.info("Success to close vertx {}.", vertx);
} else {
LOGGER.info("Failed to close vertx {}.", vertx);
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientOptionsSPI.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientOptionsSPI.java
index abac2283316..83bf28db9ca 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientOptionsSPI.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientOptionsSPI.java
@@ -125,15 +125,12 @@ static HttpClientOptions createHttpClientOptions(HttpClientOptionsSPI spi) {
httpClientOptions.setProtocolVersion(spi.getHttpVersion());
httpClientOptions.setDecompressionSupported(spi.isTryUseCompression());
- httpClientOptions.setMaxWaitQueueSize(spi.getMaxWaitQueueSize());
- httpClientOptions.setMaxPoolSize(spi.getMaxPoolSize());
httpClientOptions.setKeepAlive(spi.isKeepAlive());
httpClientOptions.setMaxHeaderSize(spi.getMaxHeaderSize());
if (spi.getHttpVersion() == HttpVersion.HTTP_2) {
httpClientOptions.setHttp2ClearTextUpgrade(false);
httpClientOptions.setHttp2MultiplexingLimit(spi.getHttp2MultiplexingLimit());
- httpClientOptions.setHttp2MaxPoolSize(spi.getHttp2MaxPoolSize());
httpClientOptions.setHttp2KeepAliveTimeout(spi.getKeepAliveTimeout());
} else {
httpClientOptions.setKeepAliveTimeout(spi.getKeepAliveTimeout());
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java
index b9f4b34e033..69f15e6e397 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java
@@ -5,9 +5,7 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
* http://www.apache.org/licenses/LICENSE-2.0
- *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,6 +22,7 @@
import io.vertx.core.Context;
import io.vertx.core.http.HttpClient;
import io.vertx.core.http.HttpClientOptions;
+import io.vertx.core.http.PoolOptions;
// execute in vertx context
public class HttpClientPoolFactory implements ClientPoolFactory {
@@ -31,13 +30,18 @@ public class HttpClientPoolFactory implements ClientPoolFactory {
LOGGER.debug("http connection connected, local:{}, remote:{}.",
connection.localAddress(), connection.remoteAddress());
@@ -46,7 +50,7 @@ public HttpClientWithContext createClientPool(Context context) {
connection.localAddress(), connection.remoteAddress())
);
connection.exceptionHandler(e ->
- LOGGER.info("http connection exception, local:{}, remote:{}.",
+ LOGGER.error("http connection exception, local:{}, remote:{}.",
connection.localAddress(), connection.remoteAddress(), e)
);
}).build();
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClients.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClients.java
index 9eb29816483..b1ef46436ec 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClients.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClients.java
@@ -37,6 +37,7 @@
import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import io.vertx.core.dns.AddressResolverOptions;
+import io.vertx.core.http.PoolOptions;
import io.vertx.core.http.WebSocketClient;
/**
@@ -70,8 +71,12 @@ public static void destroy() {
private static ClientPoolManager createClientPoolManager(HttpClientOptionsSPI option) {
Vertx vertx = getOrCreateVertx(option);
+ PoolOptions poolOptions = new PoolOptions();
+ poolOptions.setMaxWaitQueueSize(option.getMaxWaitQueueSize());
+ poolOptions.setHttp1MaxSize(option.getMaxPoolSize());
+ poolOptions.setHttp2MaxSize(option.getHttp2MaxPoolSize());
ClientPoolManager clientPoolManager = new ClientPoolManager<>(vertx,
- new HttpClientPoolFactory(HttpClientOptionsSPI.createHttpClientOptions(option)));
+ new HttpClientPoolFactory(HttpClientOptionsSPI.createHttpClientOptions(option), poolOptions));
DeploymentOptions deployOptions = VertxUtils.createClientDeployOptions(clientPoolManager,
option.getInstanceCount())
@@ -103,7 +108,7 @@ private static Vertx getOrCreateVertx(HttpClientOptionsSPI option) {
.setEventLoopPoolSize(option.getEventLoopPoolSize());
// Maybe we can deploy only one vert.x for the application. However this has did it like this.
- return VertxUtils.getOrCreateVertxByName(option.clientName(), vertxOptions);
+ return VertxUtils.getOrCreateVertxByName(option.clientName(), vertxOptions, null);
}
/**
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/AbstractTcpClientPackage.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/AbstractTcpClientPackage.java
index 763ba5e3daf..ef6717f8968 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/AbstractTcpClientPackage.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/AbstractTcpClientPackage.java
@@ -27,9 +27,9 @@ public static long getAndIncRequestId() {
return reqId.getAndIncrement();
}
- private long msRequestTimeout;
+ private volatile long msRequestTimeout;
- private long finishWriteToBuffer;
+ private volatile long finishWriteToBuffer;
protected long msgId = getAndIncRequestId();
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/NetClientWrapper.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/NetClientWrapper.java
index a36d80c246c..ce47126ee47 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/NetClientWrapper.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/NetClientWrapper.java
@@ -16,8 +16,7 @@
*/
package org.apache.servicecomb.foundation.vertx.client.tcp;
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Handler;
+import io.vertx.core.Future;
import io.vertx.core.Vertx;
import io.vertx.core.net.NetClient;
import io.vertx.core.net.NetSocket;
@@ -50,12 +49,11 @@ public TcpClientConfig getClientConfig(boolean ssl) {
return normalClientConfig;
}
- public void connect(boolean ssl, int port, String host, Handler> connectHandler) {
+ public Future connect(boolean ssl, int port, String host) {
if (ssl) {
- sslNetClient.connect(port, host, connectHandler);
- return;
+ return sslNetClient.connect(port, host);
}
- normalNetClient.connect(port, host, connectHandler);
+ return normalNetClient.connect(port, host);
}
}
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/TcpClientConnection.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/TcpClientConnection.java
index d8800800ff6..db071e3c34f 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/TcpClientConnection.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/tcp/TcpClientConnection.java
@@ -39,6 +39,7 @@
import io.vertx.core.AsyncResult;
import io.vertx.core.Context;
+import io.vertx.core.Future;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.net.NetSocket;
import io.vertx.core.net.impl.NetSocketImpl;
@@ -61,7 +62,7 @@ enum Status {
private final InetSocketAddress socketAddress;
- private boolean localSupportLogin = false;
+ private volatile boolean localSupportLogin = false;
private final boolean remoteSupportLogin;
@@ -180,17 +181,17 @@ protected void connect() {
this.status = Status.CONNECTING;
LOGGER.info("connecting to address {}", socketAddress.toString());
- netClientWrapper.connect(endpoint.isSslEnabled(),
+ Future result = netClientWrapper.connect(endpoint.isSslEnabled(),
socketAddress.getPort(),
- socketAddress.getHostString(),
- ar -> {
- if (ar.succeeded()) {
- onConnectSuccess(ar.result());
- return;
- }
-
- onConnectFailed(ar.cause());
- });
+ socketAddress.getHostString());
+ result.onComplete((socket, fail) -> {
+ if (fail == null) {
+ onConnectSuccess(socket);
+ return;
+ }
+
+ onConnectFailed(fail);
+ });
}
private void onConnectSuccess(NetSocket socket) {
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java
index e6a7947eb2b..acd2fc1978a 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java
@@ -27,8 +27,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.vertx.core.AsyncResult;
import io.vertx.core.Context;
+import io.vertx.core.Future;
import io.vertx.core.Vertx;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.file.AsyncFile;
@@ -82,15 +82,13 @@ public ReadStream getReadStream() {
}
/**
- *
- * @param writeStream
* @return future of save action
*
* important: WriteStream did not provide endHandler, so we can not know when will really finished write.
* so the return future only means finished read from readStream.
*/
public CompletableFuture saveToWriteStream(WriteStream writeStream) {
- return new PumpCommon().pump(context, readStream, writeStream, null);
+ return new PumpCommon().pump(readStream, writeStream, null);
}
public CompletableFuture saveAsBytes() {
@@ -120,8 +118,6 @@ public CompletableFuture saveAs(Function converter) {
}
/**
- *
- * @param fileName
* @return future of save to file, future complete means write to file finished
*/
public CompletableFuture saveToFile(String fileName) {
@@ -132,9 +128,6 @@ public CompletableFuture saveToFile(String fileName) {
}
/**
- *
- * @param file
- * @param openOptions
* @return future of save to file, future complete means write to file finished
*/
public CompletableFuture saveToFile(File file, OpenOptions openOptions) {
@@ -142,34 +135,37 @@ public CompletableFuture saveToFile(File file, OpenOptions openOptions) {
context.runOnContext((v) -> {
Vertx vertx = context.owner();
- vertx.fileSystem().open(file.getAbsolutePath(), openOptions, ar -> onFileOpened(file, ar, future));
+ Future openFuture = vertx.fileSystem().open(file.getAbsolutePath(), openOptions);
+ openFuture.onComplete((s, f) -> onFileOpened(file, s, f, future));
});
return future;
}
- protected void onFileOpened(File file, AsyncResult ar, CompletableFuture future) {
- if (ar.failed()) {
- future.completeExceptionally(ar.cause());
+ protected void onFileOpened(File file, AsyncFile asyncFile, Throwable failure, CompletableFuture future) {
+ if (failure != null) {
+ future.completeExceptionally(failure);
return;
}
- AsyncFile asyncFile = ar.result();
CompletableFuture saveFuture = saveToWriteStream(asyncFile);
- saveFuture.whenComplete((v, saveException) -> asyncFile.close(closeAr -> {
- if (closeAr.failed()) {
- LOGGER.error("Failed to close file {}.", file);
- }
-
- // whatever close success or failed
- // will not affect to result
- // result just only related to write
- if (saveException == null) {
- future.complete(file);
- return;
- }
-
- future.completeExceptionally(saveException);
- }));
+ saveFuture.whenComplete((v, saveException) -> {
+ Future result = asyncFile.close();
+ result.onComplete((s, f) -> {
+ if (f != null) {
+ LOGGER.error("Failed to close file {}.", file);
+ }
+
+ // whatever close success or failed
+ // will not affect to result
+ // result just only related to write
+ if (saveException == null) {
+ future.complete(file);
+ return;
+ }
+
+ future.completeExceptionally(saveException);
+ });
+ });
}
}
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultClientMetrics.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultClientMetrics.java
index c3893a2e60d..2bc9288857b 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultClientMetrics.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultClientMetrics.java
@@ -17,16 +17,14 @@
package org.apache.servicecomb.foundation.vertx.metrics;
-import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultClientEndpointMetric;
-import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultClientTaskMetric;
-import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultRequestMetric;
-
import io.vertx.core.spi.metrics.ClientMetrics;
import io.vertx.core.spi.observability.HttpRequest;
import io.vertx.core.spi.observability.HttpResponse;
+import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultClientEndpointMetric;
+import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultRequestMetric;
public class DefaultClientMetrics implements
- ClientMetrics {
+ ClientMetrics {
private final DefaultClientEndpointMetric clientEndpointMetric;
public DefaultClientMetrics(DefaultClientEndpointMetric clientEndpointMetric) {
@@ -37,18 +35,6 @@ public DefaultClientEndpointMetric getClientEndpointMetric() {
return this.clientEndpointMetric;
}
- @Override
- public DefaultClientTaskMetric enqueueRequest() {
- DefaultClientTaskMetric taskMetric = new DefaultClientTaskMetric(clientEndpointMetric);
- taskMetric.enqueueRequest();
- return taskMetric;
- }
-
- @Override
- public void dequeueRequest(DefaultClientTaskMetric endpointMetric) {
- endpointMetric.dequeueRequest();
- }
-
@Override
public DefaultRequestMetric requestBegin(String uri, HttpRequest request) {
DefaultRequestMetric requestMetric = new DefaultRequestMetric(this.clientEndpointMetric);
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultHttpClientMetrics.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultHttpClientMetrics.java
index 59649948348..1279a4f8566 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultHttpClientMetrics.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultHttpClientMetrics.java
@@ -18,7 +18,6 @@
import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultClientEndpointMetric;
import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultClientEndpointMetricManager;
-import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultClientTaskMetric;
import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultRequestMetric;
import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultTcpSocketMetric;
@@ -26,7 +25,7 @@
import io.vertx.core.spi.metrics.HttpClientMetrics;
public class DefaultHttpClientMetrics implements
- HttpClientMetrics {
+ HttpClientMetrics {
private static final String PROTOCOL = "http://";
private final DefaultClientEndpointMetricManager clientEndpointMetricManager;
diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultVertxMetrics.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultVertxMetrics.java
index ee345ed4e2b..c0b89a42eea 100644
--- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultVertxMetrics.java
+++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/metrics/DefaultVertxMetrics.java
@@ -18,23 +18,22 @@
import java.util.Map;
-import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
-import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultClientEndpointMetricManager;
-import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultServerEndpointMetric;
-
import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import io.vertx.core.http.HttpClientOptions;
import io.vertx.core.http.HttpServerOptions;
-import io.vertx.core.metrics.impl.DummyVertxMetrics;
import io.vertx.core.net.NetClientOptions;
import io.vertx.core.net.NetServerOptions;
import io.vertx.core.net.SocketAddress;
import io.vertx.core.spi.metrics.HttpClientMetrics;
import io.vertx.core.spi.metrics.HttpServerMetrics;
import io.vertx.core.spi.metrics.TCPMetrics;
+import io.vertx.core.spi.metrics.VertxMetrics;
+import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
+import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultClientEndpointMetricManager;
+import org.apache.servicecomb.foundation.vertx.metrics.metric.DefaultServerEndpointMetric;
-public class DefaultVertxMetrics extends DummyVertxMetrics {
+public class DefaultVertxMetrics implements VertxMetrics {
// to support listen multiple addresses, must use a map to manage the metric
private final Map