X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4d417144e48b0f4c11efd744954a2f9e115fb9ab..458436270ce8fb80d421d55e192236c5ac4a225e:/lib/cloud/loopback/loopback.go?ds=inline diff --git a/lib/cloud/loopback/loopback.go b/lib/cloud/loopback/loopback.go index 9b71c9f162..ed2a0050f4 100644 --- a/lib/cloud/loopback/loopback.go +++ b/lib/cloud/loopback/loopback.go @@ -64,7 +64,9 @@ func (is *instanceSet) Create(it arvados.InstanceType, _ cloud.ImageID, tags clo // destroy+create cycle doesn't fix whatever was broken -- but // nothing else will either, so the best we can do is remove // the "broken" flag and try again. - if err := os.Remove("/var/lock/crunch-run-broken"); err != nil && !errors.Is(err, os.ErrNotExist) { + if err := os.Remove("/var/lock/crunch-run-broken"); err == nil { + is.logger.Info("removed /var/lock/crunch-run-broken") + } else if !errors.Is(err, os.ErrNotExist) { return nil, err } u, err := user.Current() @@ -128,12 +130,13 @@ type instance struct { sshService test.SSHService } -func (i *instance) ID() cloud.InstanceID { return cloud.InstanceID(i.instanceType.ProviderType) } -func (i *instance) String() string { return i.instanceType.ProviderType } -func (i *instance) ProviderType() string { return i.instanceType.ProviderType } -func (i *instance) Address() string { return i.sshService.Address() } -func (i *instance) RemoteUser() string { return i.adminUser } -func (i *instance) Tags() cloud.InstanceTags { return i.tags } +func (i *instance) ID() cloud.InstanceID { return cloud.InstanceID(i.instanceType.ProviderType) } +func (i *instance) String() string { return i.instanceType.ProviderType } +func (i *instance) ProviderType() string { return i.instanceType.ProviderType } +func (i *instance) Address() string { return i.sshService.Address() } +func (i *instance) PriceHistory() []cloud.InstancePrice { return nil } +func (i *instance) RemoteUser() string { return i.adminUser } +func (i *instance) Tags() cloud.InstanceTags { return i.tags } func (i *instance) SetTags(tags cloud.InstanceTags) error { i.tags = tags return nil