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

[2.7] Add Dynamic Configuration Override Support For ServiceDiscovery #8389

Merged
merged 1 commit into from Aug 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -103,5 +103,4 @@ public interface Constants {
* prefix of arguments router key
*/
String ARGUMENTS = "arguments";

}
Expand Up @@ -93,4 +93,8 @@ public interface Constants {
String REGISTRY_RETRY_PERIOD_KEY = "retry.period";

String SESSION_TIMEOUT_KEY = "session";

String NEED_REEXPORT = "need-reexport";

String ENABLE_CONFIGURATION_LISTEN = "enable-configuration-listen";
}
@@ -0,0 +1,276 @@
/*
* 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 org.apache.dubbo.registry.client;

import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.metadata.MetadataInfo;

import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;

public class OverrideInstanceAddressURL extends InstanceAddressURL {
private static final long serialVersionUID = 6015101839312074851L;

private final Map<String, String> overrideParams;
private final InstanceAddressURL originUrl;

private final transient Map<String, Map<String, Map<String, Number>>> methodNumberCache = new ConcurrentHashMap<>();
private volatile transient Map<String, Map<String, Number>> methodNumbers;
private final transient Map<String, Map<String, Number>> serviceNumberCache = new ConcurrentHashMap<>();
private volatile transient Map<String, Number> numbers;

public OverrideInstanceAddressURL(InstanceAddressURL originUrl) {
this.originUrl = originUrl;
this.overrideParams = new HashMap<>();
}

public OverrideInstanceAddressURL(InstanceAddressURL originUrl, Map<String, String> overrideParams) {
this.originUrl = originUrl;
this.overrideParams = overrideParams;
}

@Override
public ServiceInstance getInstance() {
return originUrl.getInstance();
}

@Override
public MetadataInfo getMetadataInfo() {
return originUrl.getMetadataInfo();
}

@Override
public String getServiceInterface() {
return originUrl.getServiceInterface();
}

@Override
public String getGroup() {
return originUrl.getGroup();
}

@Override
public String getVersion() {
return originUrl.getVersion();
}

@Override
public String getProtocol() {
return originUrl.getProtocol();
}

@Override
public String getProtocolServiceKey() {
return originUrl.getProtocolServiceKey();
}

@Override
public String getServiceKey() {
return originUrl.getServiceKey();
}

@Override
public String getAddress() {
return originUrl.getAddress();
}

@Override
public String getHost() {
return originUrl.getHost();
}

@Override
public int getPort() {
return originUrl.getPort();
}

@Override
public String getIp() {
return originUrl.getIp();
}

@Override
public String getPath() {
return originUrl.getPath();
}

@Override
public String getParameter(String key) {
String overrideParam = overrideParams.get(key);
return StringUtils.isNotEmpty(overrideParam) ? overrideParam : originUrl.getParameter(key);
}

@Override
public String getServiceParameter(String service, String key) {
String overrideParam = overrideParams.get(key);
return StringUtils.isNotEmpty(overrideParam) ? overrideParam : originUrl.getServiceParameter(service, key);
}

@Override
public String getServiceMethodParameter(String protocolServiceKey, String method, String key) {
String overrideParam = overrideParams.get(method + "." + key);
return StringUtils.isNotEmpty(overrideParam) ?
overrideParam :
originUrl.getServiceMethodParameter(protocolServiceKey, method, key);
}

@Override
public String getMethodParameter(String method, String key) {
String overrideParam = overrideParams.get(method + "." + key);
return StringUtils.isNotEmpty(overrideParam) ?
overrideParam :
originUrl.getMethodParameter(method, key);
}

@Override
public boolean hasServiceMethodParameter(String protocolServiceKey, String method, String key) {
return StringUtils.isNotEmpty(overrideParams.get(method + "." + key)) ||
originUrl.hasServiceMethodParameter(protocolServiceKey, method, key);
}

@Override
public boolean hasMethodParameter(String method, String key) {
return StringUtils.isNotEmpty(overrideParams.get(method + "." + key)) ||
originUrl.hasMethodParameter(method, key);
}

@Override
public boolean hasServiceMethodParameter(String protocolServiceKey, String method) {
return overrideParams.keySet().stream().anyMatch((e)->e.startsWith(method) || originUrl.hasServiceMethodParameter(protocolServiceKey, method));
}

@Override
public boolean hasMethodParameter(String method) {
return overrideParams.keySet().stream().anyMatch((e)->e.startsWith(method) || originUrl.hasMethodParameter(method));
}

@Override
public Map<String, String> getServiceParameters(String protocolServiceKey) {
Map<String, String> parameters = originUrl.getServiceParameters(protocolServiceKey);
Map<String, String> overrideParameters = overrideParams;
Map<String, String> result = new HashMap<>((int) (parameters.size() + overrideParameters.size() / 0.75f) + 1);
result.putAll(parameters);
result.putAll(overrideParameters);
return result;
}

@Override
public Map<String, String> getParameters() {
Map<String, String> parameters = originUrl.getParameters();
Map<String, String> overrideParameters = overrideParams;
Map<String, String> result = new HashMap<>((int) (parameters.size() + overrideParameters.size() / 0.75f) + 1);
result.putAll(parameters);
result.putAll(overrideParameters);
return result;
}

@Override
public URL addParameter(String key, String value) {
HashMap<String, String> map = new HashMap<>(overrideParams);
map.put(key, value);
return new OverrideInstanceAddressURL(originUrl, map);
}

@Override
public URL addParameterIfAbsent(String key, String value) {
HashMap<String, String> map = new HashMap<>(overrideParams);
map.putIfAbsent(key, value);
return new OverrideInstanceAddressURL(originUrl, map);
}

@Override
public URL addServiceParameter(String protocolServiceKey, String key, String value) {
return originUrl.addServiceParameter(protocolServiceKey, key, value);
}

@Override
public URL addServiceParameterIfAbsent(String protocolServiceKey, String key, String value) {
return originUrl.addServiceParameterIfAbsent(protocolServiceKey, key, value);
}

@Override
public URL addConsumerParams(String protocolServiceKey, Map<String, String> params) {
return originUrl.addConsumerParams(protocolServiceKey, params);
}

@Override
public URL addParameters(Map<String, String> parameters) {
HashMap<String, String> map = new HashMap<>(overrideParams);
map.putAll(parameters);
return new OverrideInstanceAddressURL(originUrl, map);
}

@Override
public URL addParametersIfAbsent(Map<String, String> parameters) {
HashMap<String, String> map = new HashMap<>(overrideParams);
parameters.forEach(map::putIfAbsent);
return new OverrideInstanceAddressURL(originUrl, map);
}

@Override
protected Map<String, Number> getServiceNumbers(String protocolServiceKey) {
return serviceNumberCache.computeIfAbsent(protocolServiceKey, (k) -> new ConcurrentHashMap<>());
}

@Override
protected Map<String, Number> getNumbers() {
if (numbers == null) { // concurrent initialization is tolerant
numbers = new ConcurrentHashMap<>();
}
return numbers;
}

@Override
protected Map<String, Map<String, Number>> getServiceMethodNumbers(String protocolServiceKey) {
return methodNumberCache.computeIfAbsent(protocolServiceKey, (k) -> new ConcurrentHashMap<>());
}

@Override
protected Map<String, Map<String, Number>> getMethodNumbers() {
if (methodNumbers == null) { // concurrent initialization is tolerant
methodNumbers = new ConcurrentHashMap<>();
}
return methodNumbers;
}

public Map<String, String> getOverrideParams() {
return overrideParams;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
OverrideInstanceAddressURL that = (OverrideInstanceAddressURL) o;
return Objects.equals(overrideParams, that.overrideParams) && Objects.equals(originUrl, that.originUrl);
}

@Override
public int hashCode() {
return Objects.hash(super.hashCode(), overrideParams, originUrl);
}

@Override
public String toString() {
return originUrl.toString() + ", overrideParams: " + overrideParams.toString();
}

}