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.

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

cluster: check active before reload promtheus when scale-in/scale-out #1775

Merged
merged 2 commits into from
Mar 7, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
17 changes: 9 additions & 8 deletions pkg/cluster/manager/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,17 @@ func buildReloadPromAndGrafanaTasks(
if deletedNodes.Exist(inst.ID()) {
continue
}
// reload Prometheus
action := "reload"
if inst.ComponentName() == spec.ComponentGrafana {

t := task.NewBuilder(logger)
if inst.ComponentName() == spec.ComponentPrometheus {
// reload Prometheus
t = t.SystemCtl(inst.GetHost(), inst.ServiceName(), "reload", true, true)
} else {
// restart grafana
action = "restart"
t = t.SystemCtl(inst.GetHost(), inst.ServiceName(), "restart", true, false)
}
t := task.NewBuilder(logger).
SystemCtl(inst.GetHost(), inst.ServiceName(), action, true).
BuildAsStep(fmt.Sprintf(" - Reload %s -> %s", inst.ComponentName(), inst.ID()))
tasks = append(tasks, t)

tasks = append(tasks, t.BuildAsStep(fmt.Sprintf(" - Reload %s -> %s", inst.ComponentName(), inst.ID())))
}
return tasks
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cluster/manager/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ func fixFailedChecks(host string, res *operator.CheckResult, t *task.Builder) (s
if len(fields) < 2 {
return "", fmt.Errorf("can not perform action of service, %s", res.Msg)
}
t.SystemCtl(host, fields[1], fields[0], false)
t.SystemCtl(host, fields[1], fields[0], false, false)
msg = fmt.Sprintf("will try to '%s'", color.HiBlueString(res.Msg))
case operator.CheckNameSysctl:
fields := strings.Fields(res.Msg)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cluster/manager/destroy.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func (m *Manager) DestroyTombstone(
UpdateMeta(name, clusterMeta, nodes).
UpdateTopology(name, m.specManager.Path(name), clusterMeta, nodes).
ParallelStep("+ Refresh instance configs", gOpt.Force, regenConfigTasks...).
ParallelStep("+ Reloda prometheus and grafana", gOpt.Force,
ParallelStep("+ Reload prometheus and grafana", gOpt.Force,
buildReloadPromAndGrafanaTasks(metadata.GetTopology(), m.logger, gOpt)...).
Build()

Expand Down
2 changes: 1 addition & 1 deletion pkg/cluster/manager/scale_in.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (m *Manager) ScaleIn(

t := b.
ParallelStep("+ Refresh instance configs", force, regenConfigTasks...).
ParallelStep("+ Reloda prometheus and grafana", gOpt.Force,
ParallelStep("+ Reload prometheus and grafana", gOpt.Force,
buildReloadPromAndGrafanaTasks(metadata.GetTopology(), m.logger, gOpt, nodes...)...).
Build()

Expand Down
7 changes: 6 additions & 1 deletion pkg/cluster/module/systemd.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type SystemdModuleConfig struct {
Unit string // the name of systemd unit(s)
Action string // the action to perform with the unit
ReloadDaemon bool // run daemon-reload before other actions
CheckActive bool // run is-active before action
Scope string // user, system or global
Force bool // add the `--force` arg to systemctl command
Signal string // specify the signal to send to process
Expand Down Expand Up @@ -72,11 +73,15 @@ func NewSystemdModule(config SystemdModuleConfig) *SystemdModule {
cmd := fmt.Sprintf("%s %s %s",
systemctl, strings.ToLower(config.Action), config.Unit)

if config.CheckActive {
cmd = fmt.Sprintf("if [[ $(%s is-active %s) == \"active\" ]]; then %s; fi",
systemctl, config.Unit, cmd)
}

if config.ReloadDaemon {
cmd = fmt.Sprintf("%s daemon-reload && %s",
systemctl, cmd)
}

mod := &SystemdModule{
cmd: cmd,
sudo: sudo,
Expand Down
3 changes: 2 additions & 1 deletion pkg/cluster/task/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -383,12 +383,13 @@ func (b *Builder) Shell(host, command, cmdID string, sudo bool) *Builder {
}

// SystemCtl run systemctl on host
func (b *Builder) SystemCtl(host, unit, action string, daemonReload bool) *Builder {
func (b *Builder) SystemCtl(host, unit, action string, daemonReload, checkActive bool) *Builder {
b.tasks = append(b.tasks, &SystemCtl{
host: host,
unit: unit,
action: action,
daemonReload: daemonReload,
checkactive: checkActive,
})
return b
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/cluster/task/systemd.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type SystemCtl struct {
unit string
action string
daemonReload bool
checkactive bool
}

// Execute implements the Task interface
Expand All @@ -41,6 +42,7 @@ func (c *SystemCtl) Execute(ctx context.Context) error {
Unit: c.unit,
Action: c.action,
ReloadDaemon: c.daemonReload,
CheckActive: c.checkactive,
}
systemd := module.NewSystemdModule(cfg)
stdout, stderr, err := systemd.Execute(ctx, e)
Expand Down