-
Notifications
You must be signed in to change notification settings - Fork 8k
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
Add data-source extension for OpenSergo fault-tolerance spec #2842
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
a8c2198
Add data-source extension for OpenSergo spec
sczyh30 e551cbf
build(deps): Upgrade opensergo.sdk.version to 0.1.0-alpha
sczyh30 8be6ddf
Merge branch 'master' into feature/opensergo-datasource
sczyh30 41b6562
Update pom of sentinel-datasource-opensergo
sczyh30 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
26 changes: 26 additions & 0 deletions
26
sentinel-extension/sentinel-datasource-opensergo/README.md
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,26 @@ | ||
# Sentinel OpenSergo data-source | ||
|
||
Sentinel OpenSergo data-source provides integration with OpenSergo. | ||
The data source leverages [OpenSergo Java SDK](https://github.com/opensergo/opensergo-java-sdk) to implement subscribe (push) model. | ||
|
||
## Usage | ||
|
||
To use Sentinel OpenSergo data-source, you'll need to add the following Maven dependency: | ||
|
||
```xml | ||
<dependency> | ||
<groupId>com.alibaba.csp</groupId> | ||
<artifactId>sentinel-datasource-opensergo</artifactId> | ||
<version>x.y.z</version> | ||
</dependency> | ||
``` | ||
|
||
Then you can create an `OpenSergoDataSourceGroup` and subscribe Sentinel rules. For example: | ||
|
||
```java | ||
OpenSergoDataSourceGroup openSergo = new OpenSergoDataSourceGroup(host, port, namespace, appName); | ||
openSergo.start(); | ||
|
||
// Subscribe flow rules from OpenSergo control plane, and propagate to Sentinel rule manager. | ||
FlowRuleManager.register2Property(openSergo.subscribeFlowRules()); | ||
``` |
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,40 @@ | ||
<?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"> | ||
<parent> | ||
<artifactId>sentinel-extension</artifactId> | ||
<groupId>com.alibaba.csp</groupId> | ||
<version>1.8.5</version> | ||
</parent> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<artifactId>sentinel-datasource-opensergo</artifactId> | ||
|
||
<properties> | ||
<java.source.version>1.8</java.source.version> | ||
<java.target.version>1.8</java.target.version> | ||
|
||
<opensergo.sdk.version>0.1.0-SNAPSHOT</opensergo.sdk.version> | ||
</properties> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>com.alibaba.csp</groupId> | ||
<artifactId>sentinel-datasource-extension</artifactId> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>io.opensergo</groupId> | ||
<artifactId>opensergo-java-sdk</artifactId> | ||
<version>${opensergo.sdk.version}</version> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>junit</groupId> | ||
<artifactId>junit</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
|
||
</project> |
299 changes: 299 additions & 0 deletions
299
...opensergo/src/main/java/com/alibaba/csp/sentinel/datasource/OpenSergoDataSourceGroup.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,299 @@ | ||
/* | ||
* Copyright 1999-2022 Alibaba Group Holding Ltd. | ||
* | ||
* 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 | ||
* | ||
* https://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 com.alibaba.csp.sentinel.datasource; | ||
|
||
import java.util.List; | ||
import java.util.Map.Entry; | ||
import java.util.concurrent.ConcurrentHashMap; | ||
import java.util.concurrent.ConcurrentMap; | ||
import java.util.concurrent.atomic.AtomicBoolean; | ||
|
||
import com.alibaba.csp.sentinel.log.RecordLog; | ||
import com.alibaba.csp.sentinel.property.DynamicSentinelProperty; | ||
import com.alibaba.csp.sentinel.property.SentinelProperty; | ||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule; | ||
import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; | ||
import com.alibaba.csp.sentinel.util.AssertUtil; | ||
|
||
import io.opensergo.ConfigKind; | ||
import io.opensergo.OpenSergoClient; | ||
import io.opensergo.proto.fault_tolerance.v1.CircuitBreakerStrategy; | ||
import io.opensergo.proto.fault_tolerance.v1.FaultToleranceRule; | ||
import io.opensergo.proto.fault_tolerance.v1.RateLimitStrategy; | ||
import io.opensergo.proto.fault_tolerance.v1.ThrottlingStrategy; | ||
import io.opensergo.subscribe.OpenSergoConfigSubscriber; | ||
import io.opensergo.subscribe.SubscribeKey; | ||
|
||
/** | ||
* <p>Data-source group for subscribing Sentinel rules from OpenSergo control plane.</p> | ||
* | ||
* @author Eric Zhao | ||
*/ | ||
public class OpenSergoDataSourceGroup { | ||
|
||
private final OpenSergoClient openSergoClient; | ||
|
||
private final String namespace; | ||
private final String app; | ||
|
||
/** | ||
* (SentinelRuleKind, SentinelProperty) | ||
*/ | ||
private final ConcurrentMap<String, SentinelProperty> dataSourceMap = new ConcurrentHashMap<>(); | ||
|
||
private final ConcurrentMap<ConfigKind, SubscribeKey> subscribeKeyMap = new ConcurrentHashMap<>(); | ||
private final ConcurrentMap<String, Boolean> sentinelRuleSubscribeMap = new ConcurrentHashMap<>(); | ||
|
||
private final OpenSergoRuleAggregator ruleAggregator; | ||
|
||
private final AtomicBoolean started = new AtomicBoolean(false); | ||
|
||
/** | ||
* @param host host of OpenSergo Control Plane | ||
* @param port port of OpenSergo Control Plane | ||
* @param namespace namespace to subscribe | ||
* @param app appName to subscribe | ||
*/ | ||
public OpenSergoDataSourceGroup(String host, int port, String namespace, String app) { | ||
AssertUtil.notEmpty(namespace, "namespace cannot be empty"); | ||
AssertUtil.notEmpty(app, "app cannot be empty"); | ||
this.openSergoClient = new OpenSergoClient(host, port); | ||
this.namespace = namespace; | ||
this.app = app; | ||
this.ruleAggregator = new OpenSergoRuleAggregator(dataSourceMap); | ||
|
||
initializeDataSourceMap(); | ||
} | ||
|
||
private void initializeDataSourceMap() { | ||
dataSourceMap.put(OpenSergoSentinelConstants.KIND_FLOW_RULE, new DynamicSentinelProperty<List<FlowRule>>()); | ||
dataSourceMap.put(OpenSergoSentinelConstants.KIND_CIRCUIT_BREAKER_RULE, | ||
new DynamicSentinelProperty<List<DegradeRule>>()); | ||
} | ||
|
||
public void start() throws Exception { | ||
if (started.compareAndSet(false, true)) { | ||
openSergoClient.start(); | ||
|
||
prepareForBaseSubscription(); | ||
} | ||
} | ||
|
||
public void close() throws Exception { | ||
if (started.compareAndSet(true, false)) { | ||
for (Entry<ConfigKind, SubscribeKey> e : subscribeKeyMap.entrySet()) { | ||
openSergoClient.unsubscribeConfig(e.getValue()); | ||
RecordLog.info("Unsubscribing OpenSergo config for target: {}", e.getValue()); | ||
} | ||
|
||
openSergoClient.close(); | ||
} | ||
} | ||
|
||
private void prepareForBaseSubscription() { | ||
SubscribeKey key = new SubscribeKey(namespace, app, ConfigKind.FAULT_TOLERANCE_RULE); | ||
|
||
openSergoClient.subscribeConfig(key, new OpenSergoFaultToleranceRuleSubscriber(ruleAggregator)); | ||
subscribeKeyMap.put(ConfigKind.FAULT_TOLERANCE_RULE, key); | ||
|
||
RecordLog.info("Subscribing OpenSergo base fault-tolerance rules for target <{}, {}>", namespace, app); | ||
} | ||
|
||
public boolean hasSubscribedFor(String sentinelRuleKind) { | ||
if (sentinelRuleKind == null) { | ||
return false; | ||
} | ||
return sentinelRuleSubscribeMap.getOrDefault(sentinelRuleKind, false); | ||
} | ||
|
||
/** | ||
* <p>Subscribe Sentinel flow rules from OpenSergo control plane.</p> | ||
* | ||
* @return {@link SentinelProperty} of Sentinel flow rules | ||
*/ | ||
public synchronized SentinelProperty<List<FlowRule>> subscribeFlowRules() { | ||
if (!started.get()) { | ||
throw new IllegalStateException("OpenSergo data-source not started"); | ||
} | ||
|
||
boolean subscribed = hasSubscribedFor(OpenSergoSentinelConstants.KIND_FLOW_RULE); | ||
SentinelProperty<List<FlowRule>> property = dataSourceMap.get(OpenSergoSentinelConstants.KIND_FLOW_RULE); | ||
if (subscribed) { | ||
return property; | ||
} | ||
|
||
OpenSergoSentinelFlowRuleSubscriber subscriber = new OpenSergoSentinelFlowRuleSubscriber(ruleAggregator); | ||
|
||
SubscribeKey rlsKey = new SubscribeKey(namespace, app, ConfigKind.RATE_LIMIT_STRATEGY); | ||
sczyh30 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
openSergoClient.subscribeConfig(rlsKey, subscriber); | ||
subscribeKeyMap.put(ConfigKind.RATE_LIMIT_STRATEGY, rlsKey); | ||
RecordLog.info("Subscribing OpenSergo config for target: {}", rlsKey); | ||
|
||
SubscribeKey tsKey = new SubscribeKey(namespace, app, ConfigKind.THROTTLING_STRATEGY); | ||
openSergoClient.subscribeConfig(tsKey, subscriber); | ||
subscribeKeyMap.put(ConfigKind.THROTTLING_STRATEGY, tsKey); | ||
RecordLog.info("Subscribing OpenSergo config for target: {}", tsKey); | ||
|
||
SubscribeKey concurrencyLimitKey = new SubscribeKey(namespace, app, ConfigKind.CONCURRENCY_LIMIT_STRATEGY); | ||
openSergoClient.subscribeConfig(concurrencyLimitKey, subscriber); | ||
subscribeKeyMap.put(ConfigKind.CONCURRENCY_LIMIT_STRATEGY, concurrencyLimitKey); | ||
RecordLog.info("Subscribing OpenSergo config for target: {}", concurrencyLimitKey); | ||
|
||
sentinelRuleSubscribeMap.put(OpenSergoSentinelConstants.KIND_FLOW_RULE, true); | ||
|
||
return property; | ||
} | ||
|
||
/** | ||
* <p>Subscribe Sentinel degrade rules from OpenSergo control plane.</p> | ||
* | ||
* @return {@link SentinelProperty} of Sentinel degrade rules | ||
*/ | ||
public synchronized SentinelProperty<List<DegradeRule>> subscribeDegradeRules() { | ||
if (!started.get()) { | ||
throw new IllegalStateException("OpenSergo data-source not started"); | ||
} | ||
|
||
boolean subscribed = hasSubscribedFor(OpenSergoSentinelConstants.KIND_CIRCUIT_BREAKER_RULE); | ||
SentinelProperty<List<DegradeRule>> property = dataSourceMap.get( | ||
OpenSergoSentinelConstants.KIND_CIRCUIT_BREAKER_RULE); | ||
if (subscribed) { | ||
return property; | ||
} | ||
|
||
SubscribeKey subscribeKey = new SubscribeKey(namespace, app, ConfigKind.CIRCUIT_BREAKER_STRATEGY); | ||
openSergoClient.subscribeConfig(subscribeKey, | ||
new OpenSergoSentinelCircuitBreakerRuleSubscriber(ruleAggregator)); | ||
subscribeKeyMap.put(ConfigKind.CIRCUIT_BREAKER_STRATEGY, subscribeKey); | ||
RecordLog.info("Subscribing OpenSergo config for target: {}", subscribeKey); | ||
|
||
sentinelRuleSubscribeMap.put(OpenSergoSentinelConstants.KIND_CIRCUIT_BREAKER_RULE, true); | ||
|
||
return property; | ||
} | ||
|
||
/** | ||
* <p>Subscribe Sentinel flow rules from OpenSergo control plane.</p> | ||
*/ | ||
public synchronized void unsubscribeFlowRules() { | ||
boolean subscribed = hasSubscribedFor(OpenSergoSentinelConstants.KIND_FLOW_RULE); | ||
if (!subscribed) { | ||
return; | ||
} | ||
|
||
SubscribeKey rlsKey = subscribeKeyMap.remove(ConfigKind.RATE_LIMIT_STRATEGY); | ||
boolean rlRemoved = openSergoClient.unsubscribeConfig(rlsKey); | ||
SubscribeKey tsKey = subscribeKeyMap.remove(ConfigKind.THROTTLING_STRATEGY); | ||
boolean tsRemoved = openSergoClient.unsubscribeConfig(tsKey); | ||
SubscribeKey concurrencyLimitKey = subscribeKeyMap.remove(ConfigKind.CONCURRENCY_LIMIT_STRATEGY); | ||
boolean clRemoved = openSergoClient.unsubscribeConfig(concurrencyLimitKey); | ||
|
||
sentinelRuleSubscribeMap.remove(OpenSergoSentinelConstants.KIND_FLOW_RULE); | ||
|
||
// NOTE: unsubscribe operation does not affect existing rules in SentinelProperty. | ||
} | ||
|
||
public synchronized void unsubscribeDegradeRules() { | ||
boolean subscribed = hasSubscribedFor(OpenSergoSentinelConstants.KIND_CIRCUIT_BREAKER_RULE); | ||
if (!subscribed) { | ||
return; | ||
} | ||
|
||
SubscribeKey cbKey = subscribeKeyMap.remove(ConfigKind.CIRCUIT_BREAKER_STRATEGY); | ||
boolean cbRemoved = openSergoClient.unsubscribeConfig(cbKey); | ||
|
||
sentinelRuleSubscribeMap.remove(OpenSergoSentinelConstants.KIND_CIRCUIT_BREAKER_RULE); | ||
|
||
// NOTE: unsubscribe operation does not affect existing rules in SentinelProperty. | ||
} | ||
|
||
public String getNamespace() { | ||
return namespace; | ||
} | ||
|
||
public String getApp() { | ||
return app; | ||
} | ||
|
||
static class OpenSergoFaultToleranceRuleSubscriber implements OpenSergoConfigSubscriber { | ||
|
||
private final OpenSergoRuleAggregator ruleAggregator; | ||
|
||
public OpenSergoFaultToleranceRuleSubscriber(OpenSergoRuleAggregator ruleAggregator) { | ||
this.ruleAggregator = ruleAggregator; | ||
} | ||
|
||
@Override | ||
public boolean onConfigUpdate(SubscribeKey subscribeKey, Object data) { | ||
if (subscribeKey.getKind() != ConfigKind.FAULT_TOLERANCE_RULE || !(data instanceof List)) { | ||
// type or data mismatch | ||
return false; | ||
} | ||
return ruleAggregator.updateFaultToleranceRuleList((List<FaultToleranceRule>) data); | ||
} | ||
} | ||
|
||
/** | ||
* Subscriber for OpenSergo strategies related to Sentinel flow rules. | ||
*/ | ||
static class OpenSergoSentinelFlowRuleSubscriber implements OpenSergoConfigSubscriber { | ||
|
||
private final OpenSergoRuleAggregator ruleAggregator; | ||
|
||
public OpenSergoSentinelFlowRuleSubscriber(OpenSergoRuleAggregator ruleAggregator) { | ||
this.ruleAggregator = ruleAggregator; | ||
} | ||
|
||
@Override | ||
public boolean onConfigUpdate(SubscribeKey subscribeKey, Object data) { | ||
if (!(data instanceof List)) { | ||
// data mismatch | ||
return false; | ||
} | ||
|
||
switch (subscribeKey.getKind()) { | ||
case RATE_LIMIT_STRATEGY: | ||
return ruleAggregator.updateRateLimitStrategy((List<RateLimitStrategy>) data); | ||
case THROTTLING_STRATEGY: | ||
return ruleAggregator.updateThrottlingStrategy((List<ThrottlingStrategy>) data); | ||
case CONCURRENCY_LIMIT_STRATEGY: | ||
// TODO | ||
return false; | ||
default: | ||
// Type mismatch | ||
return false; | ||
} | ||
} | ||
} | ||
|
||
static class OpenSergoSentinelCircuitBreakerRuleSubscriber implements OpenSergoConfigSubscriber { | ||
|
||
private final OpenSergoRuleAggregator ruleAggregator; | ||
|
||
public OpenSergoSentinelCircuitBreakerRuleSubscriber(OpenSergoRuleAggregator ruleAggregator) { | ||
this.ruleAggregator = ruleAggregator; | ||
} | ||
|
||
@Override | ||
public boolean onConfigUpdate(SubscribeKey subscribeKey, Object data) { | ||
if (subscribeKey.getKind() != ConfigKind.CIRCUIT_BREAKER_STRATEGY || !(data instanceof List)) { | ||
// type or data mismatch | ||
return false; | ||
} | ||
return ruleAggregator.updateCircuitBreakerStrategy((List<CircuitBreakerStrategy>) data); | ||
} | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to set a delayed start here, such as the following code segment:
This is done so that the user can manually set the timeout