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

serf: Set broadcast timeout to one minute #2100

Merged
merged 1 commit into from
Sep 26, 2022
Merged

serf: Set broadcast timeout to one minute #2100

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
2 changes: 1 addition & 1 deletion dctest/before_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func runBeforeSuiteInstall() {
for _, host := range allBootServers {
_, _, err := execAt(host, "test -f /tmp/auto-config-done")
if err != nil {
return err
return fmt.Errorf("auto-config has not been completed. host: %s, err: %v", host, err)
}
}
return nil
Expand Down
1 change: 1 addition & 0 deletions ignitions/common/files/opt/sbin/setup-serf-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ cat >/etc/serf/serf.json <<EOF
"reconnect_interval": "30s",
"reconnect_timeout": "24h",
"tombstone_timeout": "24h",
"broadcast_timeout": "1m",
"retry_join": [
"${sabakan_addr}"
],
Expand Down
2 changes: 1 addition & 1 deletion ignitions/common/systemd/setup-serf-tags.timer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Wants=serf.service
After=serf.service

[Timer]
OnCalendar=*-*-* *:*:0/20
OnCalendar=minutely

[Install]
WantedBy=multi-user.target
1 change: 1 addition & 0 deletions progs/serf/conf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func GenerateConf(w io.Writer, lrns []int, osName, osVersion, serial string) err
ReconnectInterval: "30s",
ReconnectTimeout: "24h",
TombstoneTimeout: "24h",
BroadcastTimeout: "1m",
RetryJoin: endpoints,
RetryMaxAttempts: 0,
RetryInterval: "30s",
Expand Down
1 change: 1 addition & 0 deletions progs/serf/conf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func TestGenerateConf(t *testing.T) {
ReconnectInterval: "30s",
ReconnectTimeout: "24h",
TombstoneTimeout: "24h",
BroadcastTimeout: "1m",
RetryJoin: expectedRetryJoin,
RetryMaxAttempts: 0,
RetryInterval: "30s",
Expand Down
1 change: 1 addition & 0 deletions progs/serf/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ type serfConfig struct {
ReconnectInterval string `json:"reconnect_interval"`
ReconnectTimeout string `json:"reconnect_timeout"`
TombstoneTimeout string `json:"tombstone_timeout"`
BroadcastTimeout string `json:"broadcast_timeout"`
RetryJoin []string `json:"retry_join"`
RetryMaxAttempts int `json:"retry_max_attempts"`
RetryInterval string `json:"retry_interval"`
Expand Down
2 changes: 1 addition & 1 deletion worker/setup_serf_tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Wants=serf.service
After=serf.service

[Timer]
OnCalendar=*-*-* *:*:0/20
OnCalendar=minutely

[Install]
WantedBy=multi-user.target
Expand Down