You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by GitBox <gi...@apache.org> on 2022/12/12 07:33:41 UTC
[GitHub] [dubbo] CrazyHZM commented on a diff in pull request #11094: Add 'label match' support for override and tag rules
CrazyHZM commented on code in PR #11094:
URL: https://github.com/apache/dubbo/pull/11094#discussion_r1045390831
##########
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java:
##########
@@ -118,46 +118,88 @@ private URL configureDeprecated(URL url) {
private URL configureIfMatch(String host, URL url) {
if (ANYHOST_VALUE.equals(configuratorUrl.getHost()) || host.equals(configuratorUrl.getHost())) {
- // TODO, to support wildcards
- String providers = configuratorUrl.getParameter(OVERRIDE_PROVIDERS_KEY);
- if (StringUtils.isEmpty(providers) || providers.contains(url.getAddress()) || providers.contains(ANYHOST_VALUE)) {
- String configApplication = configuratorUrl.getApplication(configuratorUrl.getUsername());
- String currentApplication = url.getApplication(url.getUsername());
- if (configApplication == null || ANY_VALUE.equals(configApplication)
- || configApplication.equals(currentApplication)) {
- Set<String> conditionKeys = new HashSet<String>();
- conditionKeys.add(CATEGORY_KEY);
- conditionKeys.add(Constants.CHECK_KEY);
- conditionKeys.add(DYNAMIC_KEY);
- conditionKeys.add(ENABLED_KEY);
- conditionKeys.add(GROUP_KEY);
- conditionKeys.add(VERSION_KEY);
- conditionKeys.add(APPLICATION_KEY);
- conditionKeys.add(SIDE_KEY);
- conditionKeys.add(CONFIG_VERSION_KEY);
- conditionKeys.add(COMPATIBLE_CONFIG_KEY);
- conditionKeys.add(INTERFACES);
- for (Map.Entry<String, String> entry : configuratorUrl.getParameters().entrySet()) {
- String key = entry.getKey();
- String value = entry.getValue();
- boolean startWithTilde = startWithTilde(key);
- if (startWithTilde || APPLICATION_KEY.equals(key) || SIDE_KEY.equals(key)) {
- if (startWithTilde) {
- conditionKeys.add(key);
- }
- if (value != null && !ANY_VALUE.equals(value)
- && !value.equals(url.getParameter(startWithTilde ? key.substring(1) : key))) {
- return url;
- }
+ if (isV27ConditionMatchOrUnset(url)) {
+ Set<String> conditionKeys = genConditionKeys();
+ String apiVersion = configuratorUrl.getParameter(CONFIG_VERSION_KEY);
+ if ("v3.0".equals(apiVersion)) {
Review Comment:
The version should be judged to be ≥3.0, not equal to 3.0, which will cause problems with later versions, such as 4.0...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org