natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

faq (#10542) 

* faq-meshroute

加载mesh路由规则失败

* Update MeshRuleRouter.java

fix ci/cd
This commit is contained in:
xin gu 2022-09-05 10:19:44 +08:00 committed by GitHub
parent eb919e9dd3
commit 9db2eb5a18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshAppRuleListener.java
View File

@ -20,7 +20,7 @@ package org.apache.dubbo.rpc.cluster.router.mesh.route;
import org.apache.dubbo.common.config.configcenter.ConfigChangeType;
import org.apache.dubbo.common.config.configcenter.ConfigChangedEvent;
import org.apache.dubbo.common.config.configcenter.ConfigurationListener;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.rpc.cluster.router.mesh.util.MeshRuleDispatcher;
@ -43,7 +43,7 @@ import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.S
public class MeshAppRuleListener implements ConfigurationListener {
public static final Logger logger = LoggerFactory.getLogger(MeshAppRuleListener.class);
private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(MeshAppRuleListener.class);
private final MeshRuleDispatcher meshRuleDispatcher;
@ -78,17 +78,17 @@ public class MeshAppRuleListener implements ConfigurationListener {
if (ruleType != null) {
groupMap.computeIfAbsent(ruleType, (k)-> new LinkedList<>()).add(resultMap);
} else {
logger.error("Unable to get rule type from raw rule. " +
logger.error("2-13","receive mesh app route rule is invalid","","Unable to get rule type from raw rule. " +
"Probably the metadata.name is absent. App Name: " + appName + " RawRule: " + configInfo);
}
} else {
logger.error("Rule format is unacceptable. App Name: " + appName + " RawRule: " + configInfo);
logger.error("2-13","receive mesh app route rule is invalid","","Rule format is unacceptable. App Name: " + appName + " RawRule: " + configInfo);
}
}
ruleMapHolder = groupMap;
} catch (Exception e) {
logger.error("[MeshAppRule] parse failed: " + configInfo, e);
logger.error("2-13","failed to receive mesh app route rule","","[MeshAppRule] parse failed: " + configInfo,e);
}
if (ruleMapHolder != null) {
meshRuleDispatcher.post(ruleMapHolder);

6
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java
View File

@ -18,7 +18,7 @@
package org.apache.dubbo.rpc.cluster.router.mesh.route;
import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.rpc.cluster.governance.GovernanceRuleRepository;
import org.apache.dubbo.rpc.cluster.router.mesh.util.MeshRuleListener;
@ -33,7 +33,7 @@ import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.M
public class MeshRuleManager {
public static final Logger logger = LoggerFactory.getLogger(MeshRuleManager.class);
private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(MeshRuleManager.class);
private final ConcurrentHashMap<String, MeshAppRuleListener> APP_RULE_LISTENERS = new ConcurrentHashMap<>();
@ -63,7 +63,7 @@ public class MeshRuleManager {
meshAppRuleListener.receiveConfigInfo(rawConfig);
}
} catch (Throwable throwable) {
logger.error("get MeshRuleManager app rule failed.", throwable);
logger.error("2-13","failed to get mesh app route rule","","get MeshRuleManager app rule failed.",throwable);
}
ruleRepository.addListener(appRuleDataId, DynamicConfiguration.DEFAULT_GROUP, meshAppRuleListener);

6
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleRouter.java
View File

@ -17,7 +17,7 @@
package org.apache.dubbo.rpc.cluster.router.mesh.route;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.Holder;
@ -58,7 +58,7 @@ import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.V
public abstract class MeshRuleRouter<T> extends AbstractStateRouter<T> implements MeshRuleListener {
public static final Logger logger = LoggerFactory.getLogger(MeshRuleRouter.class);
private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(MeshRuleRouter.class);
private final Map<String, String> sourcesLabels;
private volatile BitList<Invoker<T>> invokerList = BitList.emptyList();
@ -308,7 +308,7 @@ public abstract class MeshRuleRouter<T> extends AbstractStateRouter<T> implement
appToVDGroup.put(appName, vsDestinationGroup);
}
} catch (Throwable t) {
logger.error("Error occurred when parsing rule component.", t);
logger.error("2-13","failed to parse mesh route rule","","Error occurred when parsing rule component.",t);
}
computeSubset(appToVDGroup);