Skip to content

Failed to modify flow rules #2850

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.

Sign up for GitHub

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

Open
583458767 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Failed to modify flow rules #2850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ecb391
流控规则：非集群，修改为集群不生效；反之亦然
583458767 Aug 28, 2022
b09a9dd
delete redundant comments
583458767 Aug 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ...shboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/FlowControllerV1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
import com.alibaba.csp.sentinel.slots.block.flow.ClusterFlowConfig;
import com.alibaba.csp.sentinel.util.StringUtil;

import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
Expand Down Expand Up @@ -164,7 +165,8 @@ public Result<FlowRuleEntity> apiUpdateFlowRule(Long id, String app,
String limitApp, String resource, Integer grade,
Double count, Integer strategy, String refResource,
Integer controlBehavior, Integer warmUpPeriodSec,
Integer maxQueueingTimeMs) {
Integer maxQueueingTimeMs, Boolean clusterMode,
Integer thresholdType, Boolean fallbackToLocalWhenFail) {
if (id == null) {
return Result.ofFail(-1, "id can't be null");
}
Expand Down Expand Up @@ -222,6 +224,19 @@ public Result<FlowRuleEntity> apiUpdateFlowRule(Long id, String app,
}
Date date = new Date();
entity.setGmtModified(date);
if (clusterMode != null) {
entity.setClusterMode(clusterMode);
}
if (clusterMode) {
ClusterFlowConfig clusterFlowConfig = new ClusterFlowConfig();
if (thresholdType != null) {
clusterFlowConfig.setThresholdType(thresholdType);
}
if (fallbackToLocalWhenFail != null) {
clusterFlowConfig.setFallbackToLocalWhenFail(fallbackToLocalWhenFail);
}
entity.setClusterConfig(clusterFlowConfig);
}
try {
entity = repository.save(entity);
if (entity == null) {
Expand Down
3 changes: 2 additions & 1 deletion sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ app.controller('FlowControllerV1', ['$scope', '$stateParams', 'FlowServiceV1', '
limitApp: 'default',
clusterMode: false,
clusterConfig: {
thresholdType: 0
thresholdType: 0,
fallbackToLocalWhenFail : true
}
};
$scope.flowRuleDialog = {
Expand Down
5 changes: 4 additions & 1 deletion sentinel-dashboard/src/main/webapp/resources/app/scripts/services/flow_service_v1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ app.service('FlowServiceV1', ['$http', function ($http) {
controlBehavior: rule.controlBehavior,
warmUpPeriodSec: rule.warmUpPeriodSec,
maxQueueingTimeMs: rule.maxQueueingTimeMs,
clusterMode: rule.clusterMode,
thresholdType: rule.clusterMode ? rule.clusterConfig.thresholdType : undefined,
fallbackToLocalWhenFail: rule.clusterMode ? rule.clusterConfig.fallbackToLocalWhenFail :undefined
};

return $http({
Expand Down Expand Up @@ -110,7 +113,7 @@ app.service('FlowServiceV1', ['$http', function ($http) {
alert('排队超时时间必须大于 0');
return false;
}
if (rule.clusterMode && (rule.clusterConfig === undefined || rule.clusterConfig.thresholdType === undefined)) {
if (rule.clusterMode && (rule.clusterConfig === undefined || null === rule.clusterConfig || rule.clusterConfig.thresholdType === undefined)) {
alert('集群限流配置不正确');
return false;
}
Expand Down
Loading