config(engine): remove deprecated session-ttl config from executor

pingcap · Oct 19, 2022 · e306150 · e306150
1 parent 9abde06
commit e306150
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 7 deletions.
diff --git a/deployments/engine/docker-compose/config/executor.toml b/deployments/engine/docker-compose/config/executor.toml
@@ -1,6 +1,5 @@
 keepalive-ttl = "20s"
 keepalive-interval = "500ms"
-session-ttl = 20
 
 [log] 
 level = "debug"
diff --git a/deployments/engine/docker-compose/config/template_executor.toml b/deployments/engine/docker-compose/config/template_executor.toml
@@ -6,7 +6,6 @@ join = ["127.0.0.1:10240"]          # Corresponding command line:  --join
 
 keepalive-ttl = "20s"
 keepalive-interval = "500ms"
-session-ttl = 20
 
 [log] 
 level = "info"              # Corresponding command line:  --log-level

diff --git a/deployments/engine/helm/tiflow/values.yaml b/deployments/engine/helm/tiflow/values.yaml
@@ -43,7 +43,6 @@ executor:
   config: |
     keepalive-ttl = "20s"
     keepalive-interval = "500ms"
-    session-ttl = 20
 
 metastore:
   frameworkStorage: 5Gi

diff --git a/engine/executor/config.go b/engine/executor/config.go
@@ -30,7 +30,6 @@ import (
 
 var (
 	defaultJoinAddr          = "127.0.0.1:10240"
-	defaultSessionTTL        = 20
 	defaultKeepAliveTTL      = "20s"
 	defaultKeepAliveInterval = "500ms"
 	defaultRPCTimeout        = "3s"
@@ -52,8 +51,6 @@ type Config struct {
 
 	Labels map[string]string `toml:"labels" json:"labels"`
 
-	SessionTTL int `toml:"session-ttl" json:"session-ttl"`
-
 	// TODO: in the future executors should share a same ttl from server-master
 	KeepAliveTTLStr      string `toml:"keepalive-ttl" json:"keepalive-ttl"`
 	KeepAliveIntervalStr string `toml:"keepalive-interval" json:"keepalive-interval"`
@@ -147,7 +144,6 @@ func GetDefaultExecutorConfig() *Config {
 		Join:                 defaultJoinAddr,
 		Addr:                 defaultExecutorAddr,
 		AdvertiseAddr:        "",
-		SessionTTL:           defaultSessionTTL,
 		KeepAliveTTLStr:      defaultKeepAliveTTL,
 		KeepAliveIntervalStr: defaultKeepAliveInterval,
 		RPCTimeoutStr:        defaultRPCTimeout,