From 483f336071e32c13b19397639daec3ef3333a920 Mon Sep 17 00:00:00 2001 From: Sebastien BLAISOT Date: Mon, 14 Oct 2019 14:27:59 +0200 Subject: [PATCH] Improve swift-layout-v3 migration worker logs (#2136) --- worker/migrations/migrations.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/worker/migrations/migrations.go b/worker/migrations/migrations.go index c93c31a1ce4..4c101879d4c 100644 --- a/worker/migrations/migrations.go +++ b/worker/migrations/migrations.go @@ -85,6 +85,8 @@ func migrateToSwiftV3(domain string) error { return err } + log := logger.WithDomain(inst.Domain).WithField("nspace", "migration") + var srcContainer, migratedFrom string switch inst.SwiftLayout { case 0: // layout v1 @@ -106,6 +108,8 @@ func migrateToSwiftV3(domain string) error { return instance.ErrInvalidSwiftLayout } + log.Infof("Migrating from swift layout %s to swift layout v3", migratedFrom) + vfs := inst.VFS() root, err := vfs.DirByID(consts.RootDirID) if err != nil { @@ -125,7 +129,6 @@ func migrateToSwiftV3(domain string) error { defer func() { if err != nil { if err := vfsswift.DeleteContainer(c, dstContainer); err != nil { - log := logger.WithDomain(inst.Domain).WithField("nspace", "migration") log.Errorf("Failed to delete v3 container %s: %s", dstContainer, err) } } @@ -144,7 +147,9 @@ func migrateToSwiftV3(domain string) error { if err = couchdb.UpdateDoc(couchdb.GlobalDB, inst); err != nil { return err } - _ = vfs.Delete() + if err = vfs.Delete(); err != nil { + log.Errorf("Failed to delete old %s containers: %s", migratedFrom, err) + } return nil }