cloud: rename ShepherdInstall to ShepherdAccess and clean up other 'installation' references
ShepherdInstall should've been called ShepherdAgentStart from the
beginning, but got named incorrectly because of a momentary lapse of
reason.
Instead of doing a rename, we widen that Process to anything that
involved the Shepherds directly accessing the underlying provider
machines, be it starting the agent, trying to fix the machine, or
rebooting a machine. This wide meaning makes sure no two shepherds work
on the same machine ever, regardless of the actual workflow each one is
performing.
Change-Id: Ic247919d1bcf1c5ec9fcf7125f17b90413068ed5
Reviewed-on: https://review.monogon.dev/c/monogon/+/1138
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/cloud/shepherd/equinix/manager/initializer.go b/cloud/shepherd/equinix/manager/initializer.go
index fd2e00b..5b1ea49 100644
--- a/cloud/shepherd/equinix/manager/initializer.go
+++ b/cloud/shepherd/equinix/manager/initializer.go
@@ -216,7 +216,7 @@
}
defer t.work.Cancel(ctx)
- klog.Infof("Machine %q needs installation, fetching corresponding packngo device %q...", t.id, t.pid)
+ klog.Infof("Machine %q needs agent start, fetching corresponding packngo device %q...", t.id, t.pid)
dev, err := c.cl.GetDevice(ctx, c.sharedConfig.ProjectId, t.pid.String())
if err != nil {
klog.Errorf("failed to fetch device %q: %v", t.pid, err)
@@ -314,7 +314,7 @@
klog.Infof("Starting agent on device (ID: %s, PID %s)", t.id, t.pid)
apk, err := ir.startAgent(ctx, sgn, *t.dev)
if err != nil {
- return fmt.Errorf("while installing the agent: %w", err)
+ return fmt.Errorf("while starting the agent: %w", err)
}
// Agent startup succeeded. Set the appropriate BMDB tag, and release the
@@ -341,7 +341,7 @@
ir.config.DBQueryLimiter.Wait(ctx)
var machine *model.MachineProvided
- work, err := sess.Work(ctx, model.ProcessShepherdInstall, func(q *model.Queries) ([]uuid.UUID, error) {
+ work, err := sess.Work(ctx, model.ProcessShepherdAccess, func(q *model.Queries) ([]uuid.UUID, error) {
machines, err := q.GetMachinesForAgentStart(ctx, 1)
if err != nil {
return nil, err