You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@seata.apache.org by xi...@apache.org on 2024/02/19 04:54:43 UTC
(incubator-seata) branch 2.x updated: optimize: remove enableDegrade properties (#6350)
This is an automated email from the ASF dual-hosted git repository.
xingfudeshi pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new e5fab2d64a optimize: remove enableDegrade properties (#6350)
e5fab2d64a is described below
commit e5fab2d64ac8c44d7a3b669deb188c82c1c8b341
Author: jimin <sl...@163.com>
AuthorDate: Mon Feb 19 12:54:38 2024 +0800
optimize: remove enableDegrade properties (#6350)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
.../java/org/apache/seata/common/ConfigurationKeys.java | 5 -----
script/client/conf/file.conf | 2 --
script/client/spring/application.properties | 1 -
script/client/spring/application.yml | 1 -
script/config-center/config.txt | 1 -
.../autoconfigure/properties/client/ServiceProperties.java | 14 +-------------
.../spring/boot/autoconfigure/ClientPropertiesTest.java | 1 -
9 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index f8b810a549..cbb8a0c685 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -97,6 +97,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6144](https://github.com/apache/incubator-seata/pull/6144)] upgrade nacos client to 1.4.6
- [[#6147](https://github.com/apache/incubator-seata/pull/6147)] upgrade kafka-clients to 3.6.1
- [[#6340](https://github.com/apache/incubator-seata/pull/6340)] upgrade and tidy some dependencies
+- [[#6350](https://github.com/apache/incubator-seata/pull/6350)] remove enableDegrade properties
- [[#6349](https://github.com/apache/incubator-seata/pull/6349)] transfer dockerhub repo
### test:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index e171e074f9..e4988a2317 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -97,6 +97,7 @@
- [[#6145](https://github.com/apache/incubator-seata/pull/6145)] 升级 jettison依赖版本至1.5.4
- [[#6147](https://github.com/apache/incubator-seata/pull/6147)] 升级 kafka-clients依赖至3.6.1
- [[#6340](https://github.com/apache/incubator-seata/pull/6340)] 升级和整理依赖
+- [[#6350](https://github.com/apache/incubator-seata/pull/6350)] 移除 enableDegrade 配置
### test:
- [[#6081](https://github.com/apache/incubator-seata/pull/6081)] 添加 `test-os.yml` 用于测试seata在各种操作系统下的运行情况
diff --git a/common/src/main/java/org/apache/seata/common/ConfigurationKeys.java b/common/src/main/java/org/apache/seata/common/ConfigurationKeys.java
index dd0ceb841f..7e6521c5ab 100644
--- a/common/src/main/java/org/apache/seata/common/ConfigurationKeys.java
+++ b/common/src/main/java/org/apache/seata/common/ConfigurationKeys.java
@@ -151,11 +151,6 @@ public interface ConfigurationKeys {
*/
String SERVER_NODE_SPLIT_CHAR = System.getProperty("line.separator");
- /**
- * The constant ENABLE_DEGRADE_POSTFIX.
- */
- String ENABLE_DEGRADE_POSTFIX = "enableDegrade";
-
/**
* The constant CLIENT_PREFIX.
*/
diff --git a/script/client/conf/file.conf b/script/client/conf/file.conf
index 8a076b3334..92c836e17a 100644
--- a/script/client/conf/file.conf
+++ b/script/client/conf/file.conf
@@ -58,8 +58,6 @@ service {
vgroupMapping.default_tx_group = "default"
#only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
- #degrade, current not support
- enableDegrade = false
#disable seata
disableGlobalTransaction = false
}
diff --git a/script/client/spring/application.properties b/script/client/spring/application.properties
index a3d6456e37..eddf85d617 100755
--- a/script/client/spring/application.properties
+++ b/script/client/spring/application.properties
@@ -62,7 +62,6 @@ seata.client.load-balance.virtual-nodes=10
seata.log.exception-rate=100
seata.service.vgroup-mapping.default_tx_group=default
seata.service.grouplist.default=127.0.0.1:8091
-seata.service.enable-degrade=false
seata.service.disable-global-transaction=false
seata.transport.shutdown.wait=3
seata.transport.thread-factory.boss-thread-prefix=NettyBoss
diff --git a/script/client/spring/application.yml b/script/client/spring/application.yml
index 7bb002cdf6..6034f5a653 100755
--- a/script/client/spring/application.yml
+++ b/script/client/spring/application.yml
@@ -70,7 +70,6 @@ seata:
default_tx_group: default
grouplist:
default: 127.0.0.1:8091
- enable-degrade: false
disable-global-transaction: false
transport:
shutdown:
diff --git a/script/config-center/config.txt b/script/config-center/config.txt
index 0b62de08c4..9c2ae1c9de 100644
--- a/script/config-center/config.txt
+++ b/script/config-center/config.txt
@@ -26,7 +26,6 @@ transport.compressor=none
service.vgroupMapping.default_tx_group=default
#If you use a registry, you can ignore it
service.default.grouplist=127.0.0.1:8091
-service.enableDegrade=false
service.disableGlobalTransaction=false
client.metadataMaxAgeMs=30000
diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-client/src/main/java/org/apache/seata/spring/boot/autoconfigure/properties/client/ServiceProperties.java b/seata-spring-autoconfigure/seata-spring-autoconfigure-client/src/main/java/org/apache/seata/spring/boot/autoconfigure/properties/client/ServiceProperties.java
index af4865fcf7..f3afd9ace2 100644
--- a/seata-spring-autoconfigure/seata-spring-autoconfigure-client/src/main/java/org/apache/seata/spring/boot/autoconfigure/properties/client/ServiceProperties.java
+++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-client/src/main/java/org/apache/seata/spring/boot/autoconfigure/properties/client/ServiceProperties.java
@@ -42,10 +42,7 @@ public class ServiceProperties implements InitializingBean {
* group list
*/
private Map<String, String> grouplist = new HashMap<>();
- /**
- * degrade current not support
- */
- private boolean enableDegrade = false;
+
/**
* disable globalTransaction
*/
@@ -67,15 +64,6 @@ public class ServiceProperties implements InitializingBean {
this.grouplist = grouplist;
}
- public boolean isEnableDegrade() {
- return enableDegrade;
- }
-
- public ServiceProperties setEnableDegrade(boolean enableDegrade) {
- this.enableDegrade = enableDegrade;
- return this;
- }
-
public boolean isDisableGlobalTransaction() {
return disableGlobalTransaction;
}
diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-client/src/test/java/org/apache/seata/spring/boot/autoconfigure/ClientPropertiesTest.java b/seata-spring-autoconfigure/seata-spring-autoconfigure-client/src/test/java/org/apache/seata/spring/boot/autoconfigure/ClientPropertiesTest.java
index 31dedd13a7..03049711a3 100644
--- a/seata-spring-autoconfigure/seata-spring-autoconfigure-client/src/test/java/org/apache/seata/spring/boot/autoconfigure/ClientPropertiesTest.java
+++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-client/src/test/java/org/apache/seata/spring/boot/autoconfigure/ClientPropertiesTest.java
@@ -87,7 +87,6 @@ public class ClientPropertiesTest {
Map<String, String> grouplist = serviceProperties.getGrouplist();
assertEquals("default", vgroupMapping.get(DEFAULT_TX_GROUP));
assertEquals("127.0.0.1:8091", grouplist.get("default"));
- assertFalse(serviceProperties.isEnableDegrade());
assertFalse(serviceProperties.isDisableGlobalTransaction());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@seata.apache.org
For additional commands, e-mail: notifications-help@seata.apache.org