-
Notifications
You must be signed in to change notification settings - Fork 167
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: chengyouling <spadgerlin888@163.com>
- Loading branch information
1 parent
a61202c
commit 66cdbfb
Showing
39 changed files
with
1,857 additions
and
346 deletions.
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
sermant-plugins/sermant-mq-grayscale/mq-config-common/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>sermant-mq-grayscale</artifactId> | ||
<groupId>io.sermant</groupId> | ||
<version>1.0.0</version> | ||
</parent> | ||
|
||
<artifactId>mq-config-common</artifactId> | ||
|
||
<properties> | ||
<maven.compiler.source>8</maven.compiler.source> | ||
<maven.compiler.target>8</maven.compiler.target> | ||
</properties> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>io.sermant</groupId> | ||
<artifactId>sermant-agentcore-core</artifactId> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>junit</groupId> | ||
<artifactId>junit</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.mockito</groupId> | ||
<artifactId>mockito-core</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
</project> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
93 changes: 93 additions & 0 deletions
93
...cale/mq-config-common/src/main/java/io/sermant/mq/grayscale/config/MqGrayConfigCache.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
/* | ||
* Copyright (C) 2024-2024 Sermant Authors. All rights reserved. | ||
* | ||
* Licensed 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.sermant.mq.grayscale.config; | ||
|
||
import io.sermant.core.plugin.config.PluginConfigManager; | ||
import io.sermant.core.service.dynamicconfig.common.DynamicConfigEventType; | ||
import io.sermant.mq.grayscale.config.rocketmq.RocketMqConfigUtils; | ||
|
||
/** | ||
* grayscale config cache | ||
* | ||
* @author chengyouling | ||
* @since 2024-09-12 | ||
**/ | ||
public class MqGrayConfigCache { | ||
private static MqGrayscaleConfig cacheConfig = PluginConfigManager.getPluginConfig(MqGrayscaleConfig.class);; | ||
Check warning on line 30 in sermant-plugins/sermant-mq-grayscale/mq-config-common/src/main/java/io/sermant/mq/grayscale/config/MqGrayConfigCache.java GitHub Actions / Checkstyle
|
||
|
||
private MqGrayConfigCache() { | ||
} | ||
|
||
/** | ||
* get cache mqGrayscaleConfig | ||
* | ||
* @return mqGrayscaleConfig | ||
*/ | ||
public static MqGrayscaleConfig getCacheConfig() { | ||
return cacheConfig; | ||
} | ||
|
||
/** | ||
* set cache mqGrayscaleConfig | ||
* | ||
* @param config mqGrayscaleConfig | ||
*/ | ||
public static void setCacheConfig(MqGrayscaleConfig config, DynamicConfigEventType eventType) { | ||
Check failure on line 49 in sermant-plugins/sermant-mq-grayscale/mq-config-common/src/main/java/io/sermant/mq/grayscale/config/MqGrayConfigCache.java GitHub Actions / Checkstyle
|
||
if (eventType == DynamicConfigEventType.CREATE) { | ||
cacheConfig = config; | ||
RocketMqConfigUtils.updateChangeFlag(); | ||
RocketMqConfigUtils.recordTrafficTagsSet(config); | ||
return; | ||
} | ||
boolean isAllowRefresh = isAllowRefreshChangeFlag(cacheConfig, config); | ||
if (isAllowRefresh) { | ||
cacheConfig.updateGrayscaleConfig(MqGrayConfigCache.getCacheConfig()); | ||
RocketMqConfigUtils.updateChangeFlag(); | ||
RocketMqConfigUtils.recordTrafficTagsSet(config); | ||
} | ||
} | ||
|
||
/** | ||
* clear cache mqGrayscaleConfig | ||
*/ | ||
public static void clearCacheConfig() { | ||
cacheConfig = new MqGrayscaleConfig(); | ||
RocketMqConfigUtils.updateChangeFlag(); | ||
} | ||
|
||
/** | ||
* only traffic label changes allow refresh tag change map to rebuild SQL92 query statement, | ||
* because if the serviceMeta changed, the gray consumer cannot be matched and becomes a base consumer | ||
* so, if you need to change the env tag, restart all services. | ||
* | ||
* @param resource cache config | ||
* @param target cache config | ||
* @return boolean | ||
*/ | ||
private static boolean isAllowRefreshChangeFlag(MqGrayscaleConfig resource, MqGrayscaleConfig target) { | ||
if (resource.isEnabled() != target.isEnabled()) { | ||
return true; | ||
} | ||
if (resource.isBaseExcludeGroupTagsChanged(target)) { | ||
return true; | ||
} | ||
if (resource.isConsumerModeChanged(target)) { | ||
return true; | ||
} | ||
return !resource.buildAllTrafficTagInfoToStr().equals(target.buildAllTrafficTagInfoToStr()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
...fig-common/src/main/java/io/sermant/mq/grayscale/config/rocketmq/RocketMqConfigUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
/* | ||
* Copyright (C) 2024-2024 Sermant Authors. All rights reserved. | ||
* | ||
* Licensed 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.sermant.mq.grayscale.config.rocketmq; | ||
|
||
import io.sermant.mq.grayscale.config.GrayTagItem; | ||
import io.sermant.mq.grayscale.config.MqGrayscaleConfig; | ||
|
||
import java.util.HashSet; | ||
import java.util.Map; | ||
import java.util.Set; | ||
import java.util.concurrent.ConcurrentHashMap; | ||
|
||
/** | ||
* rocketmq config utils | ||
* | ||
* @author chengyouling | ||
* @since 2024-09-13 | ||
*/ | ||
public class RocketMqConfigUtils { | ||
Check failure on line 33 in sermant-plugins/sermant-mq-grayscale/mq-config-common/src/main/java/io/sermant/mq/grayscale/config/rocketmq/RocketMqConfigUtils.java GitHub Actions / Checkstyle
|
||
/** | ||
* base instance subscript gray tag change flags | ||
* key: namesrvAddr@topic@consumerGroup | ||
* value: change flag | ||
*/ | ||
private static final Map<String, Boolean> BASE_GROUP_TAG_CHANGE_MAP = new ConcurrentHashMap<>(); | ||
|
||
/** | ||
* gray instance subscript gray tag change flags | ||
* key: namesrvAddr@topic@consumerGroup | ||
* value: change flag | ||
*/ | ||
private static final Map<String, Boolean> GRAY_GROUP_TAG_CHANGE_MAP = new ConcurrentHashMap<>(); | ||
|
||
/** | ||
* all traffic tags that's been set, using for sql92 expression reset | ||
*/ | ||
private static final Set<String> GRAY_TAGS_SET = new HashSet<>(); | ||
|
||
/** | ||
* set base consumer address@topic@group correspondents change flag | ||
* | ||
* @param subscribeScope subscribeScope | ||
* @param flag flag | ||
*/ | ||
public static void setBaseGroupTagChangeMap(String subscribeScope, boolean flag) { | ||
BASE_GROUP_TAG_CHANGE_MAP.put(subscribeScope, flag); | ||
} | ||
|
||
/** | ||
* set gray consumer address@topic@group correspondents change flag | ||
* | ||
* @param subscribeScope subscribeScope | ||
* @param flag flag | ||
*/ | ||
public static void setGrayGroupTagChangeMap(String subscribeScope, boolean flag) { | ||
GRAY_GROUP_TAG_CHANGE_MAP.put(subscribeScope, flag); | ||
} | ||
|
||
/** | ||
* get base consumer address@topic@group correspondents change flag | ||
* | ||
* @param subscribeScope subscribeScope | ||
* @return changeFlag | ||
*/ | ||
public static boolean getBaseGroupTagChangeMap(String subscribeScope) { | ||
return BASE_GROUP_TAG_CHANGE_MAP.get(subscribeScope) != null && BASE_GROUP_TAG_CHANGE_MAP.get(subscribeScope); | ||
} | ||
|
||
/** | ||
* get gray consumer address@topic@group correspondents change flag | ||
* | ||
* @param subscribeScope subscribeScope | ||
* @return changeFlag | ||
*/ | ||
public static boolean getGrayGroupTagChangeMap(String subscribeScope) { | ||
return GRAY_GROUP_TAG_CHANGE_MAP.get(subscribeScope) != null && GRAY_GROUP_TAG_CHANGE_MAP.get(subscribeScope); | ||
} | ||
|
||
/** | ||
* update all consumer gray tag change flag | ||
*/ | ||
public static void updateChangeFlag() { | ||
BASE_GROUP_TAG_CHANGE_MAP.replaceAll((k, v) -> true); | ||
GRAY_GROUP_TAG_CHANGE_MAP.replaceAll((k, v) -> true); | ||
} | ||
|
||
/** | ||
* records traffic labels for historical and current configuration settings | ||
* | ||
* @param config config | ||
*/ | ||
public static void recordTrafficTagsSet(MqGrayscaleConfig config) { | ||
for (GrayTagItem item : config.getGrayscale()) { | ||
if (!item.getTrafficTag().isEmpty()) { | ||
GRAY_TAGS_SET.addAll(item.getTrafficTag().keySet()); | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* get all config set gray tags | ||
* | ||
* @return all config set gray tags | ||
*/ | ||
public static Set<String> getGrayTagsSet() { | ||
return GRAY_TAGS_SET; | ||
} | ||
} |
File renamed without changes.
47 changes: 47 additions & 0 deletions
47
sermant-plugins/sermant-mq-grayscale/mq-config-service/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<artifactId>sermant-mq-grayscale</artifactId> | ||
<groupId>io.sermant</groupId> | ||
<version>1.0.0</version> | ||
</parent> | ||
|
||
<artifactId>mq-config-service</artifactId> | ||
|
||
<properties> | ||
<maven.compiler.source>8</maven.compiler.source> | ||
<maven.compiler.target>8</maven.compiler.target> | ||
<package.plugin.type>service</package.plugin.type> | ||
</properties> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>org.yaml</groupId> | ||
<artifactId>snakeyaml</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>io.sermant</groupId> | ||
<artifactId>sermant-agentcore-core</artifactId> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>io.sermant</groupId> | ||
<artifactId>mq-config-common</artifactId> | ||
<version>${project.version}</version> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>junit</groupId> | ||
<artifactId>junit</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.mockito</groupId> | ||
<artifactId>mockito-core</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.