Skip to content
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

Jump to bottom

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

Merged
merged 1 commit into from
Oct 19, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion deployments/engine/docker-compose/config/executor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
keepalive-ttl = "20s"
keepalive-interval = "500ms"
session-ttl = 20

[log]
level = "debug"
1 change: 0 additions & 1 deletion deployments/engine/docker-compose/config/template_executor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion deployments/engine/helm/tiflow/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ executor:
config: |
keepalive-ttl = "20s"
keepalive-interval = "500ms"
session-ttl = 20

metastore:
frameworkStorage: 5Gi
Expand Down
4 changes: 0 additions & 4 deletions engine/executor/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (

var (
defaultJoinAddr = "127.0.0.1:10240"
defaultSessionTTL = 20
defaultKeepAliveTTL = "20s"
defaultKeepAliveInterval = "500ms"
defaultRPCTimeout = "3s"
Expand All @@ -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"`
Expand Down Expand Up @@ -147,7 +144,6 @@ func GetDefaultExecutorConfig() *Config {
Join: defaultJoinAddr,
Addr: defaultExecutorAddr,
AdvertiseAddr: "",
SessionTTL: defaultSessionTTL,
KeepAliveTTLStr: defaultKeepAliveTTL,
KeepAliveIntervalStr: defaultKeepAliveInterval,
RPCTimeoutStr: defaultRPCTimeout,
Expand Down