You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@seata.apache.org by te...@apache.org on 2026/10/15 07:47:28 UTC
(incubator-seata-go) branch master updated: fix(tm): remove unsupported degrade check configuration (#1204)
This is an automated email from the ASF dual-hosted git repository.
thunguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-seata-go.git
The following commit(s) were added to refs/heads/master by this push:
new 3b671c55 fix(tm): remove unsupported degrade check configuration (#1204)
3b671c55 is described below
commit 3b671c55770c2040622e05f74b95a93286a5e9cc
Author: XiaoFei <20...@qq.com>
AuthorDate: Thu Oct 15 15:47:23 2026 +0800
fix(tm): remove unsupported degrade check configuration (#1204)
Co-authored-by: ThunGuo <te...@apache.org>
---
pkg/client/config_test.go | 8 +-----
pkg/tm/config.go | 6 -----
pkg/tm/config_test.go | 30 ----------------------
pkg/tm/init_test.go | 19 --------------
.../getty/getty_global_transaction_test.go | 9 -------
.../grpc/grpc_global_transaction_test.go | 9 -------
pkg/tm/transaction_executor.go | 1 +
testdata/conf/seatago.yml | 3 ---
8 files changed, 2 insertions(+), 83 deletions(-)
diff --git a/pkg/client/config_test.go b/pkg/client/config_test.go
index 897b73be..a7579792 100644
--- a/pkg/client/config_test.go
+++ b/pkg/client/config_test.go
@@ -106,9 +106,6 @@ func TestLoadPath(t *testing.T) {
assert.Equal(t, 5, cfg.ClientConfig.TmConfig.CommitRetryCount)
assert.Equal(t, 5, cfg.ClientConfig.TmConfig.RollbackRetryCount)
assert.Equal(t, time.Second*60, cfg.ClientConfig.TmConfig.DefaultGlobalTransactionTimeout)
- assert.Equal(t, false, cfg.ClientConfig.TmConfig.DegradeCheck)
- assert.Equal(t, 2000, cfg.ClientConfig.TmConfig.DegradeCheckPeriod)
- assert.Equal(t, time.Second*10, cfg.ClientConfig.TmConfig.DegradeCheckAllowTimes)
assert.Equal(t, -2147482648, cfg.ClientConfig.TmConfig.InterceptorOrder)
assert.Equal(t, 10000, cfg.ClientConfig.RmConfig.AsyncCommitBufferLimit)
@@ -194,7 +191,7 @@ func TestLoadPath(t *testing.T) {
}
func TestLoadJson(t *testing.T) {
- confJson := `{"enabled":false,"application-id":"application_test","tx-service-group":"default_tx_group","access-key":"test","secret-key":"test","enable-auto-data-source-proxy":false,"data-source-proxy-mode":"AT","client":{"rm":{"async-commit-buffer-limit":10000,"report-retry-count":5,"table-meta-check-enable":false,"report-success-enable":false,"saga-branch-register-enable":false,"saga-json-parser":"fastjson","saga-retry-persist-mode-update":false,"saga-compensate-persist-mode-update":f [...]
+ confJson := `{"enabled":false,"application-id":"application_test","tx-service-group":"default_tx_group","access-key":"test","secret-key":"test","enable-auto-data-source-proxy":false,"data-source-proxy-mode":"AT","client":{"rm":{"async-commit-buffer-limit":10000,"report-retry-count":5,"table-meta-check-enable":false,"report-success-enable":false,"saga-branch-register-enable":false,"saga-json-parser":"fastjson","saga-retry-persist-mode-update":false,"saga-compensate-persist-mode-update":f [...]
cfg := LoadJson([]byte(confJson))
assert.NotNil(t, cfg)
assert.Equal(t, false, cfg.Enabled)
@@ -241,9 +238,6 @@ func TestLoadJson(t *testing.T) {
assert.Equal(t, 5, cfg.ClientConfig.TmConfig.CommitRetryCount)
assert.Equal(t, 5, cfg.ClientConfig.TmConfig.RollbackRetryCount)
assert.Equal(t, time.Second*60, cfg.ClientConfig.TmConfig.DefaultGlobalTransactionTimeout)
- assert.Equal(t, false, cfg.ClientConfig.TmConfig.DegradeCheck)
- assert.Equal(t, 2000, cfg.ClientConfig.TmConfig.DegradeCheckPeriod)
- assert.Equal(t, time.Second*10, cfg.ClientConfig.TmConfig.DegradeCheckAllowTimes)
assert.Equal(t, -2147482648, cfg.ClientConfig.TmConfig.InterceptorOrder)
assert.NotNil(t, cfg.ClientConfig.LoadBalanceConfig)
diff --git a/pkg/tm/config.go b/pkg/tm/config.go
index b940910c..15507de6 100644
--- a/pkg/tm/config.go
+++ b/pkg/tm/config.go
@@ -26,9 +26,6 @@ type TmConfig struct {
CommitRetryCount int `yaml:"commit-retry-count" json:"commit-retry-count" koanf:"commit-retry-count"`
RollbackRetryCount int `yaml:"rollback-retry-count" json:"rollback-retry-count" koanf:"rollback-retry-count"`
DefaultGlobalTransactionTimeout time.Duration `yaml:"default-global-transaction-timeout" json:"default-global-transaction-timeout,omitempty" koanf:"default-global-transaction-timeout"`
- DegradeCheck bool `yaml:"degrade-check" json:"degrade-check" koanf:"degrade-check"`
- DegradeCheckPeriod int `yaml:"degrade-check-period" json:"degrade-check-period" koanf:"degrade-check-period"`
- DegradeCheckAllowTimes time.Duration `yaml:"degrade-check-allow-times" json:"degrade-check-allow-times" koanf:"degrade-check-allow-times"`
InterceptorOrder int `yaml:"interceptor-order" json:"interceptor-order" koanf:"interceptor-order"`
}
@@ -36,8 +33,5 @@ func (cfg *TmConfig) RegisterFlagsWithPrefix(prefix string, f *flag.FlagSet) {
f.IntVar(&cfg.CommitRetryCount, prefix+".commit-retry-count", 5, "The maximum number of retries when commit global transaction.")
f.IntVar(&cfg.RollbackRetryCount, prefix+".rollback-retry-count", 5, "The maximum number of retries when rollback global transaction.")
f.DurationVar(&cfg.DefaultGlobalTransactionTimeout, prefix+".default-global-transaction-timeout", 60*time.Second, "The timeout for a global transaction.")
- f.BoolVar(&cfg.DegradeCheck, prefix+".degrade-check", false, "The switch for degrade check.")
- f.IntVar(&cfg.DegradeCheckPeriod, prefix+".degrade-check-period", 2000, "The period for degrade checking.")
- f.DurationVar(&cfg.DegradeCheckAllowTimes, prefix+".degrade-check-allow-times", 10*time.Second, "The duration allowed for degrade checking.")
f.IntVar(&cfg.InterceptorOrder, prefix+".interceptor-order", -2147482648, "The order of interceptor.")
}
diff --git a/pkg/tm/config_test.go b/pkg/tm/config_test.go
index eac8f55b..51a2f469 100644
--- a/pkg/tm/config_test.go
+++ b/pkg/tm/config_test.go
@@ -32,9 +32,6 @@ func TestTmConfig_DefaultValues(t *testing.T) {
assert.Equal(t, 0, cfg.CommitRetryCount)
assert.Equal(t, 0, cfg.RollbackRetryCount)
assert.Equal(t, time.Duration(0), cfg.DefaultGlobalTransactionTimeout)
- assert.False(t, cfg.DegradeCheck)
- assert.Equal(t, 0, cfg.DegradeCheckPeriod)
- assert.Equal(t, time.Duration(0), cfg.DegradeCheckAllowTimes)
assert.Equal(t, 0, cfg.InterceptorOrder)
}
@@ -43,18 +40,12 @@ func TestTmConfig_SetValues(t *testing.T) {
CommitRetryCount: 10,
RollbackRetryCount: 5,
DefaultGlobalTransactionTimeout: 30 * time.Second,
- DegradeCheck: true,
- DegradeCheckPeriod: 1000,
- DegradeCheckAllowTimes: 5 * time.Second,
InterceptorOrder: 100,
}
assert.Equal(t, 10, cfg.CommitRetryCount)
assert.Equal(t, 5, cfg.RollbackRetryCount)
assert.Equal(t, 30*time.Second, cfg.DefaultGlobalTransactionTimeout)
- assert.True(t, cfg.DegradeCheck)
- assert.Equal(t, 1000, cfg.DegradeCheckPeriod)
- assert.Equal(t, 5*time.Second, cfg.DegradeCheckAllowTimes)
assert.Equal(t, 100, cfg.InterceptorOrder)
}
@@ -90,9 +81,6 @@ func TestTmConfig_FieldTypes(t *testing.T) {
assert.IsType(t, int(0), cfg.CommitRetryCount)
assert.IsType(t, int(0), cfg.RollbackRetryCount)
assert.IsType(t, time.Duration(0), cfg.DefaultGlobalTransactionTimeout)
- assert.IsType(t, false, cfg.DegradeCheck)
- assert.IsType(t, int(0), cfg.DegradeCheckPeriod)
- assert.IsType(t, time.Duration(0), cfg.DegradeCheckAllowTimes)
assert.IsType(t, int(0), cfg.InterceptorOrder)
}
@@ -119,17 +107,11 @@ func TestTmConfig_FieldAssignment(t *testing.T) {
cfg.CommitRetryCount = 5
cfg.RollbackRetryCount = 3
cfg.DefaultGlobalTransactionTimeout = 60 * time.Second
- cfg.DegradeCheck = true
- cfg.DegradeCheckPeriod = 2000
- cfg.DegradeCheckAllowTimes = 10 * time.Second
cfg.InterceptorOrder = -1000
assert.Equal(t, 5, cfg.CommitRetryCount)
assert.Equal(t, 3, cfg.RollbackRetryCount)
assert.Equal(t, 60*time.Second, cfg.DefaultGlobalTransactionTimeout)
- assert.True(t, cfg.DegradeCheck)
- assert.Equal(t, 2000, cfg.DegradeCheckPeriod)
- assert.Equal(t, 10*time.Second, cfg.DegradeCheckAllowTimes)
assert.Equal(t, -1000, cfg.InterceptorOrder)
}
@@ -138,9 +120,6 @@ func TestTmConfig_NegativeValues(t *testing.T) {
CommitRetryCount: -1,
RollbackRetryCount: -5,
DefaultGlobalTransactionTimeout: -1 * time.Second,
- DegradeCheck: false,
- DegradeCheckPeriod: -100,
- DegradeCheckAllowTimes: -5 * time.Second,
InterceptorOrder: -2147483648,
}
@@ -148,9 +127,6 @@ func TestTmConfig_NegativeValues(t *testing.T) {
assert.Equal(t, -1, cfg.CommitRetryCount)
assert.Equal(t, -5, cfg.RollbackRetryCount)
assert.Equal(t, -1*time.Second, cfg.DefaultGlobalTransactionTimeout)
- assert.False(t, cfg.DegradeCheck)
- assert.Equal(t, -100, cfg.DegradeCheckPeriod)
- assert.Equal(t, -5*time.Second, cfg.DegradeCheckAllowTimes)
assert.Equal(t, -2147483648, cfg.InterceptorOrder)
}
@@ -159,17 +135,11 @@ func TestTmConfig_ExtremeValues(t *testing.T) {
CommitRetryCount: 2147483647, // Max int32
RollbackRetryCount: 2147483647, // Max int32
DefaultGlobalTransactionTimeout: 24 * time.Hour,
- DegradeCheck: true,
- DegradeCheckPeriod: 2147483647, // Max int32
- DegradeCheckAllowTimes: 24 * time.Hour,
InterceptorOrder: 2147483647, // Max int32
}
assert.Equal(t, 2147483647, cfg.CommitRetryCount)
assert.Equal(t, 2147483647, cfg.RollbackRetryCount)
assert.Equal(t, 24*time.Hour, cfg.DefaultGlobalTransactionTimeout)
- assert.True(t, cfg.DegradeCheck)
- assert.Equal(t, 2147483647, cfg.DegradeCheckPeriod)
- assert.Equal(t, 24*time.Hour, cfg.DegradeCheckAllowTimes)
assert.Equal(t, 2147483647, cfg.InterceptorOrder)
}
diff --git a/pkg/tm/init_test.go b/pkg/tm/init_test.go
index 822aa49a..dcfaa609 100644
--- a/pkg/tm/init_test.go
+++ b/pkg/tm/init_test.go
@@ -36,9 +36,6 @@ func TestInitTm(t *testing.T) {
CommitRetryCount: 5,
RollbackRetryCount: 3,
DefaultGlobalTransactionTimeout: 30 * time.Second,
- DegradeCheck: true,
- DegradeCheckPeriod: 1000,
- DegradeCheckAllowTimes: 5 * time.Second,
InterceptorOrder: 100,
}
@@ -47,9 +44,6 @@ func TestInitTm(t *testing.T) {
assert.Equal(t, testConfig.CommitRetryCount, config.CommitRetryCount)
assert.Equal(t, testConfig.RollbackRetryCount, config.RollbackRetryCount)
assert.Equal(t, testConfig.DefaultGlobalTransactionTimeout, config.DefaultGlobalTransactionTimeout)
- assert.Equal(t, testConfig.DegradeCheck, config.DegradeCheck)
- assert.Equal(t, testConfig.DegradeCheckPeriod, config.DegradeCheckPeriod)
- assert.Equal(t, testConfig.DegradeCheckAllowTimes, config.DegradeCheckAllowTimes)
assert.Equal(t, testConfig.InterceptorOrder, config.InterceptorOrder)
}
@@ -68,9 +62,6 @@ func TestInitTm_ZeroConfig(t *testing.T) {
assert.Equal(t, 0, config.CommitRetryCount)
assert.Equal(t, 0, config.RollbackRetryCount)
assert.Equal(t, time.Duration(0), config.DefaultGlobalTransactionTimeout)
- assert.False(t, config.DegradeCheck)
- assert.Equal(t, 0, config.DegradeCheckPeriod)
- assert.Equal(t, time.Duration(0), config.DegradeCheckAllowTimes)
assert.Equal(t, 0, config.InterceptorOrder)
}
@@ -85,26 +76,22 @@ func TestInitTm_MultipleInits(t *testing.T) {
firstConfig := TmConfig{
CommitRetryCount: 10,
RollbackRetryCount: 5,
- DegradeCheck: true,
}
secondConfig := TmConfig{
CommitRetryCount: 20,
RollbackRetryCount: 15,
- DegradeCheck: false,
}
// First initialization
InitTm(firstConfig)
assert.Equal(t, 10, config.CommitRetryCount)
assert.Equal(t, 5, config.RollbackRetryCount)
- assert.True(t, config.DegradeCheck)
// Second initialization should override
InitTm(secondConfig)
assert.Equal(t, 20, config.CommitRetryCount)
assert.Equal(t, 15, config.RollbackRetryCount)
- assert.False(t, config.DegradeCheck)
}
func TestInitTm_ConfigIsolation(t *testing.T) {
@@ -141,9 +128,6 @@ func TestInitTm_ExtremeValues(t *testing.T) {
CommitRetryCount: 2147483647, // Max int32
RollbackRetryCount: -2147483648, // Min int32
DefaultGlobalTransactionTimeout: 24 * time.Hour, // Large duration
- DegradeCheck: true,
- DegradeCheckPeriod: 0,
- DegradeCheckAllowTimes: time.Nanosecond, // Small duration
InterceptorOrder: -1000000,
}
@@ -152,9 +136,6 @@ func TestInitTm_ExtremeValues(t *testing.T) {
assert.Equal(t, 2147483647, config.CommitRetryCount)
assert.Equal(t, -2147483648, config.RollbackRetryCount)
assert.Equal(t, 24*time.Hour, config.DefaultGlobalTransactionTimeout)
- assert.True(t, config.DegradeCheck)
- assert.Equal(t, 0, config.DegradeCheckPeriod)
- assert.Equal(t, time.Nanosecond, config.DegradeCheckAllowTimes)
assert.Equal(t, -1000000, config.InterceptorOrder)
}
diff --git a/pkg/tm/transaction/getty/getty_global_transaction_test.go b/pkg/tm/transaction/getty/getty_global_transaction_test.go
index e59e70e3..b6a23237 100644
--- a/pkg/tm/transaction/getty/getty_global_transaction_test.go
+++ b/pkg/tm/transaction/getty/getty_global_transaction_test.go
@@ -43,9 +43,6 @@ func TestGettyGlobalTransactionBegin(t *testing.T) {
CommitRetryCount: 5,
RollbackRetryCount: 5,
DefaultGlobalTransactionTimeout: 60 * time.Second,
- DegradeCheck: false,
- DegradeCheckPeriod: 2000,
- DegradeCheckAllowTimes: 10 * time.Second,
InterceptorOrder: -2147482648,
})
gts := []struct {
@@ -145,9 +142,6 @@ func TestGettyGlobalTransactionCommit(t *testing.T) {
CommitRetryCount: 5,
RollbackRetryCount: 5,
DefaultGlobalTransactionTimeout: 60 * time.Second,
- DegradeCheck: false,
- DegradeCheckPeriod: 2000,
- DegradeCheckAllowTimes: 10 * time.Second,
InterceptorOrder: -2147482648,
})
gts := []struct {
@@ -236,9 +230,6 @@ func TestGettyGlobalTransactionRollback(t *testing.T) {
CommitRetryCount: 5,
RollbackRetryCount: 5,
DefaultGlobalTransactionTimeout: 60 * time.Second,
- DegradeCheck: false,
- DegradeCheckPeriod: 2000,
- DegradeCheckAllowTimes: 10 * time.Second,
InterceptorOrder: -2147482648,
})
gts := []struct {
diff --git a/pkg/tm/transaction/grpc/grpc_global_transaction_test.go b/pkg/tm/transaction/grpc/grpc_global_transaction_test.go
index 3190b98e..4042077a 100644
--- a/pkg/tm/transaction/grpc/grpc_global_transaction_test.go
+++ b/pkg/tm/transaction/grpc/grpc_global_transaction_test.go
@@ -41,9 +41,6 @@ func TestGrpcGlobalTransactionBegin(t *testing.T) {
CommitRetryCount: 5,
RollbackRetryCount: 5,
DefaultGlobalTransactionTimeout: 60 * time.Second,
- DegradeCheck: false,
- DegradeCheckPeriod: 2000,
- DegradeCheckAllowTimes: 10 * time.Second,
InterceptorOrder: -2147482648,
})
gts := []struct {
@@ -148,9 +145,6 @@ func TestGrpcGlobalTransactionCommit(t *testing.T) {
CommitRetryCount: 5,
RollbackRetryCount: 5,
DefaultGlobalTransactionTimeout: 60 * time.Second,
- DegradeCheck: false,
- DegradeCheckPeriod: 2000,
- DegradeCheckAllowTimes: 10 * time.Second,
InterceptorOrder: -2147482648,
})
gts := []struct {
@@ -275,9 +269,6 @@ func TestGrpcGlobalTransactionRollback(t *testing.T) {
CommitRetryCount: 5,
RollbackRetryCount: 5,
DefaultGlobalTransactionTimeout: 60 * time.Second,
- DegradeCheck: false,
- DegradeCheckPeriod: 2000,
- DegradeCheckAllowTimes: 10 * time.Second,
InterceptorOrder: -2147482648,
})
gts := []struct {
diff --git a/pkg/tm/transaction_executor.go b/pkg/tm/transaction_executor.go
index 8c83eed1..5a9c7808 100644
--- a/pkg/tm/transaction_executor.go
+++ b/pkg/tm/transaction_executor.go
@@ -59,6 +59,7 @@ func WithGlobalTx(ctx context.Context, gc *GtxConfig, business CallbackWithCtx)
ClearTxConf(ctx)
}
+ // TODO(#277): Revisit explicit dynamic degradation after defining its consistency guarantees and usage constraints.
if re = Begin(ctx, gc); re != nil {
return
}
diff --git a/testdata/conf/seatago.yml b/testdata/conf/seatago.yml
index d9447e7e..d7d1af56 100644
--- a/testdata/conf/seatago.yml
+++ b/testdata/conf/seatago.yml
@@ -51,9 +51,6 @@ seata:
commit-retry-count: 5
rollback-retry-count: 5
default-global-transaction-timeout: 60s
- degrade-check: false
- degrade-check-period: 2000
- degrade-check-allow-times: 10s
interceptor-order: -2147482648
undo:
# Judge whether the before image and after image are the same，If it is the same, undo will not be recorded
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@seata.apache.org
For additional commands, e-mail: notifications-help@seata.apache.org