From c076b3a68b6902690e2c0cc86ef97503f0b1c289 Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Tue, 29 Mar 2022 16:48:49 +0800 Subject: [PATCH] SuccessDataExpire => FinishedDataExpire --- conf.sample.yml | 2 +- dtmsvr/config/config.go | 6 +++--- dtmsvr/storage/redis/redis.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf.sample.yml b/conf.sample.yml index ec3ec8b..a575807 100644 --- a/conf.sample.yml +++ b/conf.sample.yml @@ -35,7 +35,7 @@ ### flollowing config is only for some Driver # DataExpire: 604800 # Trans data will expire in 7 days. only for redis/boltdb. -# SuccessDataExpire: 86400 # successful Trans data will expire in 1 days. only for redis. +# FinishedDataExpire: 86400 # finished Trans data will expire in 1 days. only for redis. # RedisPrefix: '{a}' # default value is '{a}'. Redis storage prefix. store data to only one slot in cluster # MicroService: diff --git a/dtmsvr/config/config.go b/dtmsvr/config/config.go index f64fa32..311e1a5 100644 --- a/dtmsvr/config/config.go +++ b/dtmsvr/config/config.go @@ -46,9 +46,9 @@ type Store struct { MaxOpenConns int64 `yaml:"MaxOpenConns" default:"500"` MaxIdleConns int64 `yaml:"MaxIdleConns" default:"500"` ConnMaxLifeTime int64 `yaml:"ConnMaxLifeTime" default:"5"` - DataExpire int64 `yaml:"DataExpire" default:"604800"` // Trans data will expire in 7 days. only for redis/boltdb. - SuccessDataExpire int64 `yaml:"SuccessDataExpire" default:"86400"` // successful Trans data will expire in 1 days. only for redis. - RedisPrefix string `yaml:"RedisPrefix" default:"{a}"` // Redis storage prefix. store data to only one slot in cluster + DataExpire int64 `yaml:"DataExpire" default:"604800"` // Trans data will expire in 7 days. only for redis/boltdb. + FinishedDataExpire int64 `yaml:"FinishedDataExpire" default:"86400"` // finished Trans data will expire in 1 days. only for redis. + RedisPrefix string `yaml:"RedisPrefix" default:"{a}"` // Redis storage prefix. store data to only one slot in cluster TransGlobalTable string `yaml:"TransGlobalTable" default:"dtm.trans_global"` TransBranchOpTable string `yaml:"TransBranchOpTable" default:"dtm.trans_branch_op"` } diff --git a/dtmsvr/storage/redis/redis.go b/dtmsvr/storage/redis/redis.go index c3015be..b529c25 100644 --- a/dtmsvr/storage/redis/redis.go +++ b/dtmsvr/storage/redis/redis.go @@ -221,7 +221,7 @@ func (s *Store) ChangeGlobalStatus(global *storage.TransGlobalStore, newStatus s AppendRaw(finished). AppendRaw(global.Gid). AppendRaw(newStatus). - AppendObject(conf.Store.SuccessDataExpire) + AppendObject(conf.Store.FinishedDataExpire) _, err := callLua(args, `-- ChangeGlobalStatus local old = redis.call('GET', KEYS[4]) if old ~= ARGV[4] then