[arvados] updated: 2.1.0-2868-gee158449a

[git repository hosting]

Summary of changes:
 lib/cloud/loopback/loopback.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

       via  ee158449ac8cc70708a161cd36845f57b5a248f1 (commit)
      from  4d417144e48b0f4c11efd744954a2f9e115fb9ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ee158449ac8cc70708a161cd36845f57b5a248f1
Author: Tom Clegg <tom at curii.com>
Date:   Tue Sep 6 14:25:36 2022 -0400

    17344: Log when removing stale crunch-run-broken file.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/cloud/loopback/loopback.go b/lib/cloud/loopback/loopback.go
index 9b71c9f16..fb7a35bea 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()

-----------------------------------------------------------------------


hooks/post-receive
--