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.

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 #6476 #6478

Merged
merged 107 commits into from Jul 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
f608b21
Polish apache/dubbo#6296 : Adding the new methods into MetadataReport…
mercyblitz Jun 10, 2020
4e3c691
Polish apache/dubbo#6296 : Adding the new methods into MetadataReport…
mercyblitz Jun 10, 2020
e30a547
Polish apache/dubbo#6171 : [Feature] Introducing the composite implem…
mercyblitz Jun 10, 2020
351b439
Merge branch '2.7.8-dev' into 2.7.8-service-introspection
mercyblitz Jun 10, 2020
b086a95
2.7.8 service introspection (#6300)
mercyblitz Jun 10, 2020
b48d7d6
Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConf…
mercyblitz Jun 11, 2020
6172dd9
Merge remote-tracking branch 'origin/2.7.8-service-introspection' int…
mercyblitz Jun 11, 2020
60c441d
Merge remote-tracking branch 'upstream/master' into 2.7.8-service-int…
mercyblitz Jun 11, 2020
38e0d33
Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#p…
mercyblitz Jun 11, 2020
2a0d015
2.7.8 service introspection update (#6308)
mercyblitz Jun 11, 2020
a52ec0f
Polish apache/dubbo#6310 : Refactoring MetadataReport's methods
mercyblitz Jun 11, 2020
e2b9b56
Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#p…
mercyblitz Jun 11, 2020
ab03f26
Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#p…
mercyblitz Jun 11, 2020
55b95a7
Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation …
mercyblitz Jun 12, 2020
454cea6
Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration
mercyblitz Jun 12, 2020
2bdb538
Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by …
mercyblitz Jun 12, 2020
2c92015
Polish apache/dubbo#6315 : Reset the config base path to be "metadata…
mercyblitz Jun 12, 2020
2fbc068
Polish apache/dubbo#6315 : Bugfix
mercyblitz Jun 12, 2020
ddc4cb7
Polish apache/dubbo#6315 : Bugfix
mercyblitz Jun 12, 2020
dd7b880
2.7.8 service introspection (#6317)
mercyblitz Jun 12, 2020
8a6a6bf
Merge remote-tracking branch 'upstream/2.7.8-dev' into 2.7.8-service-…
mercyblitz Jun 15, 2020
0154426
Merge remote-tracking branch 'upstream/2.7.8-dev' into 2.7.8-service-…
mercyblitz Jun 15, 2020
eba44fa
Polish apache/dubbo#6315 : Correct words
mercyblitz Jun 15, 2020
c546f3c
Polish apache/dubbo#6333 : [Refactor] Using mandatory implementation …
mercyblitz Jun 16, 2020
05e5c4f
Polish apache/dubbo#6336 : [Refactor] org.apache.dubbo.metadata.Servi…
mercyblitz Jun 17, 2020
e65f81f
2.7.8 service introspection (#6337)
mercyblitz Jun 17, 2020
719bad7
Merge remote-tracking branch 'upstream/2.7.8-dev' into 2.7.8-service-…
mercyblitz Jun 17, 2020
cac3c0d
Polish apache/dubbo#6170 : [Feature] Introducing the externalized con…
mercyblitz Jun 17, 2020
e72a3be
Polish apache/dubbo#6342 : [Enhancement] Introducing the composite Se…
mercyblitz Jun 18, 2020
64b474c
Refactor
mercyblitz Jun 18, 2020
36e21ca
Polish apache/dubbo#6172 : [Feature] Adding the "services" attribute …
mercyblitz Jun 19, 2020
7b03172
Polish apache/dubbo#6173 : [Feature] Adding the "services" attribute …
mercyblitz Jun 19, 2020
1b12937
Polish apache/dubbo#6346 : [Issue] Merging all subscribied URLs from …
mercyblitz Jun 19, 2020
77c82d4
Polish apache/dubbo#6346 : [Issue] Merging all subscribied URLs from …
mercyblitz Jun 19, 2020
e528d75
Polish apache/dubbo#6252
mercyblitz Jun 22, 2020
f4a02de
Polish apache/dubbo#6356 & apache/dubbo#6171
mercyblitz Jun 23, 2020
3be5aa2
Polish apache/dubbo#6356 & apache/dubbo#6171
mercyblitz Jun 23, 2020
0014485
Polish apache/dubbo#6224 : Filter chain was not invoked with local ca…
mercyblitz Jun 23, 2020
6f78b4d
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 23, 2020
74777d8
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 24, 2020
cd974c4
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 24, 2020
2d12ddd
2.7.8 service introspection (#6366)
mercyblitz Jun 24, 2020
c4ca993
Merge remote-tracking branch 'upstream/2.7.8-dev' into 2.7.8-service-…
mercyblitz Jun 24, 2020
cb2e421
Polish apache/dubbo#6322 : Adding META-INF/dubbo/internal/org.apache.…
mercyblitz Jun 24, 2020
32c55aa
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 24, 2020
69cd83d
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 28, 2020
74e378b
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 28, 2020
f24d7dd
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 28, 2020
275caec
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 28, 2020
ec6a169
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 29, 2020
a03aaf0
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 29, 2020
cddd02b
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 29, 2020
08f5029
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 29, 2020
9804107
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 29, 2020
9c1f4c0
Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases…
mercyblitz Jun 29, 2020
11b2f35
2.7.8 Test Cases (#6384)
mercyblitz Jun 29, 2020
f9796c9
Merge remote-tracking branch 'upstream/master' into 2.7.8-service-int…
mercyblitz Jun 30, 2020
d6409ac
Fixed the test-cases
mercyblitz Jun 30, 2020
88bd09f
2.7.8 Dev (#6386)
mercyblitz Jun 30, 2020
6ae8c0e
Fixes the issue of merging code in Github
mercyblitz Jun 30, 2020
7791051
Polish apache/dubbo#6389 : [Issue] Resolving the issues with ConsulSe…
mercyblitz Jul 1, 2020
c299a27
Merge branch '2.7.8-dev' into 2.7.8-release
mercyblitz Jul 1, 2020
29402cf
Merge remote-tracking branch 'upstream/master' into 2.7.8-release
mercyblitz Jul 1, 2020
5f5e78d
Merge remote-tracking branch 'origin/2.7.8-release' into 2.7.8-release
mercyblitz Jul 1, 2020
e69abc5
Fixes the test-cases
mercyblitz Jul 2, 2020
85ae544
Fixes the test-cases
mercyblitz Jul 2, 2020
14383bc
Fixes the test-cases
mercyblitz Jul 2, 2020
4f52351
Upgrade the release version to be 2.7.8
mercyblitz Jul 3, 2020
50361e1
Merge remote-tracking branch 'upstream/2.7.8-release' into 2.7.8-release
mercyblitz Jul 3, 2020
6c113a7
Upgrade the release version to be 2.7.8 (#6411)
mercyblitz Jul 3, 2020
e4abd39
Polish apache/dubbo#6261 : Migration the latest Nacos registry implem…
mercyblitz Jul 3, 2020
30bfdb7
Merge remote-tracking branch 'upstream/master' into 2.7.8-release
mercyblitz Jul 3, 2020
37640a3
Polish apache/dubbo#6425 : [Infrastructure] Upgrading the spring-cont…
mercyblitz Jul 7, 2020
71edd8b
Merge remote-tracking branch 'upstream/2.7.8-release' into 2.7.8-release
mercyblitz Jul 7, 2020
d2e9baf
Hessian2 whitelist (#6378) (#6415)
mercyblitz Jul 8, 2020
8e4b281
Merge branch '2.7.8-release' into 2.7.8-release
mercyblitz Jul 8, 2020
204b599
Merge remote-tracking branch 'upstream/2.7.8-release' into 2.7.8-release
mercyblitz Jul 8, 2020
ec81db1
Merge remote-tracking branch 'origin/2.7.8-release' into 2.7.8-release
mercyblitz Jul 8, 2020
2a5f217
Polish apache/dubbo#6418 : Rest Protocol can't work when use Tomcat 9…
mercyblitz Jul 8, 2020
7285880
Merge remote-tracking branch 'upstream/master' into 2.7.8-release
mercyblitz Jul 8, 2020
ed9cb95
[2.7.8] Migration the latest Nacos registry implementation to upstrea…
mercyblitz Jul 8, 2020
5dc7018
Merge remote-tracking branch 'upstream/2.7.8-release' into 2.7.8-release
mercyblitz Jul 9, 2020
6cf8f03
Merge remote-tracking branch 'upstream/master' into 2.7.8-release
mercyblitz Jul 9, 2020
d55a8d5
2.7.8 release (#6437)
mercyblitz Jul 9, 2020
58428d6
Merge remote-tracking branch 'upstream/2.7.8-release' into 2.7.8-release
mercyblitz Jul 9, 2020
30d5b32
Polish apache/dubbo#6442 : The duplicated path in Tree-Path config-ce…
mercyblitz Jul 10, 2020
836a0fe
2.7.8 Bugfix (#6452)
mercyblitz Jul 13, 2020
4142949
Polish apache/dubbo#6456 : [Dependency] Upgrade com.alibaba.spring:sp…
mercyblitz Jul 14, 2020
05c3827
Merge remote-tracking branch 'upstream/2.7.8-release' into 2.7.8-release
mercyblitz Jul 14, 2020
4e32083
[Dependency] Upgrade com.alibaba.spring:spring-context-support to be …
mercyblitz Jul 14, 2020
0a5f4fd
Polish apache/dubbo#6459 : [Enhancement] Introducing default behavior…
mercyblitz Jul 15, 2020
bf5b915
Polish apache/dubbo#6465 : [Dependency] Upgrading nacos-client to be …
mercyblitz Jul 15, 2020
f973ffa
Polish apache/dubbo#6465 : [Dependency] Upgrading nacos-client to be …
mercyblitz Jul 15, 2020
1ab5aa0
Merge remote-tracking branch 'upstream/2.7.8-release' into 2.7.8-release
mercyblitz Jul 15, 2020
0e7f055
Polish apache/dubbo#6459 : Bugfix
mercyblitz Jul 15, 2020
d36eb18
Polish apache/dubbo#6459 : Bugfix
mercyblitz Jul 15, 2020
6249f8d
Polish apache/dubbo#6459 : Bugfix for test-cases
mercyblitz Jul 15, 2020
ccbe324
Polish apache/dubbo#6459 : Bugfix for test-cases
mercyblitz Jul 15, 2020
292a2c6
2.7.8 release (#6466)
mercyblitz Jul 15, 2020
5eb8b22
Polish apache/dubbo#6476 : [Issue] The missing protocol of MetadataRe…
mercyblitz Jul 16, 2020
b80c1f3
Polish apache/dubbo#6476 : [Issue] The missing protocol of MetadataRe…
mercyblitz Jul 16, 2020
8f3f731
Polish apache/dubbo#6476 : Integration test case
mercyblitz Jul 16, 2020
d280608
Merge remote-tracking branch 'upstream/2.7.8-release' into 2.7.8-release
mercyblitz Jul 16, 2020
4010cc8
Merge branch 'master' into 2.7.8-release
mercyblitz Jul 16, 2020
8d600a9
Issue #6476 (#6477)
mercyblitz Jul 16, 2020
86e7c20
Merge remote-tracking branch 'upstream/2.7.8-release' into 2.7.8-release
mercyblitz Jul 17, 2020
f837a7e
Merge branch '2.7.8-release' of github.com:mercyblitz/dubbo into 2.7.…
mercyblitz Jul 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -28,6 +28,7 @@
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.threadpool.concurrent.ScheduledCompletableFuture;
import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
import org.apache.dubbo.common.utils.ArrayUtils;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.ApplicationConfig;
Expand Down Expand Up @@ -100,6 +101,7 @@
import static org.apache.dubbo.common.constants.CommonConstants.REMOTE_METADATA_STORAGE_TYPE;
import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoader;
import static org.apache.dubbo.common.function.ThrowableAction.execute;
import static org.apache.dubbo.common.utils.StringUtils.isEmpty;
import static org.apache.dubbo.common.utils.StringUtils.isNotEmpty;
import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.setMetadataStorageType;
import static org.apache.dubbo.remoting.Constants.CLIENT_KEY;
Expand Down Expand Up @@ -693,7 +695,7 @@ private ConfigCenterConfig registryAsConfigCenter(RegistryConfig registryConfig)
cc.setProtocol(protocol);
cc.setPort(port);
cc.setGroup(registryConfig.getGroup());
cc.setAddress(getRegistryCompatibleAddress(registryConfig.getAddress()));
cc.setAddress(getRegistryCompatibleAddress(registryConfig));
cc.setNamespace(registryConfig.getGroup());
cc.setUsername(registryConfig.getUsername());
cc.setPassword(registryConfig.getPassword());
Expand Down Expand Up @@ -790,19 +792,33 @@ private MetadataReportConfig registryAsMetadataCenter(RegistryConfig registryCon
}
metadataReportConfig.getParameters().put(CLIENT_KEY, registryConfig.getClient());
metadataReportConfig.setGroup(registryConfig.getGroup());
metadataReportConfig.setAddress(getRegistryCompatibleAddress(registryConfig.getAddress()));
metadataReportConfig.setAddress(getRegistryCompatibleAddress(registryConfig));
metadataReportConfig.setUsername(registryConfig.getUsername());
metadataReportConfig.setPassword(registryConfig.getPassword());
metadataReportConfig.setTimeout(registryConfig.getTimeout());
return metadataReportConfig;
}

private String getRegistryCompatibleAddress(String registryAddress) {
private String getRegistryCompatibleAddress(RegistryConfig registryConfig) {
String registryAddress = registryConfig.getAddress();
String[] addresses = REGISTRY_SPLIT_PATTERN.split(registryAddress);
if (addresses == null || addresses.length == 0) {
if (ArrayUtils.isEmpty(addresses)) {
throw new IllegalStateException("Invalid registry address found.");
}
return addresses[0];
String address = addresses[0];
// since 2.7.8
// Issue : https://github.com/apache/dubbo/issues/6476
StringBuilder metadataAddressBuilder = new StringBuilder();
URL url = URL.valueOf(address);
String protocolFromAddress = url.getProtocol();
if (isEmpty(protocolFromAddress)) {
// If the protocol from address is missing, is like :
// "dubbo.registry.address = 127.0.0.1:2181"
String protocolFromConfig = registryConfig.getProtocol();
metadataAddressBuilder.append(protocolFromConfig).append("://");
}
metadataAddressBuilder.append(address);
return metadataAddressBuilder.toString();
}

private void loadRemoteConfigs() {
Expand Down
Expand Up @@ -31,7 +31,7 @@ public class ZookeeperDubboServiceProviderBootstrap {
public static void main(String[] args) {
DubboBootstrap.getInstance()
.application("zookeeper-dubbo-provider", app -> app.metadata(COMPOSITE_METADATA_STORAGE_TYPE))
.registry(builder -> builder.address("zookeeper://127.0.0.1:2181")
.registry(builder -> builder.address("127.0.0.1:2181").protocol("zookeeper")
.parameter(REGISTRY_TYPE_KEY, SERVICE_REGISTRY_TYPE))
.protocol("dubbo", builder -> builder.port(-1).name("dubbo"))
.protocol("rest", builder -> builder.port(8081).name("rest"))
Expand Down