From 430a093d855bb94c15202dc16e73c027544eba56 Mon Sep 17 00:00:00 2001 From: saffronjam Date: Fri, 10 Nov 2023 00:45:37 +0100 Subject: [PATCH 1/2] add better debug print when failing repair jobs --- service/storage_manager_service/k8s_service/k8s_service.go | 2 +- service/storage_manager_service/storage_manager_service.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/service/storage_manager_service/k8s_service/k8s_service.go b/service/storage_manager_service/k8s_service/k8s_service.go index bb62109a..3e7eb1f8 100644 --- a/service/storage_manager_service/k8s_service/k8s_service.go +++ b/service/storage_manager_service/k8s_service/k8s_service.go @@ -207,7 +207,7 @@ func DeleteStorageManager(id string) error { func RepairStorageManager(id string) error { makeError := func(err error) error { - return fmt.Errorf("failed to repair storage manager in k8s. details: %w", err) + return fmt.Errorf("failed to repair storage manager %s in k8s. details: %w", id, err) } context, err := NewStorageManagerContext(id) diff --git a/service/storage_manager_service/storage_manager_service.go b/service/storage_manager_service/storage_manager_service.go index bef04ed3..30c0eecd 100644 --- a/service/storage_manager_service/storage_manager_service.go +++ b/service/storage_manager_service/storage_manager_service.go @@ -158,7 +158,7 @@ func DeleteStorageManager(id string) error { func RepairStorageManager(id string) error { makeErr := func(err error) error { - return fmt.Errorf("failed to repair storage manager. details: %w", err) + return fmt.Errorf("failed to repair storage manager %s. details: %w", id, err) } storageManager, err := storage_manager.New().GetByID(id) From 5b26f60cb21e0f9adbcb52e5409e57e6a9b6c3a9 Mon Sep 17 00:00:00 2001 From: saffronjam Date: Fri, 10 Nov 2023 00:47:30 +0100 Subject: [PATCH 2/2] fix better printing, id instead of name --- pkg/workers/confirm/workers.go | 8 ++++---- pkg/workers/repair/workers.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/workers/confirm/workers.go b/pkg/workers/confirm/workers.go index 7a8aea2c..90fe25f4 100644 --- a/pkg/workers/confirm/workers.go +++ b/pkg/workers/confirm/workers.go @@ -22,7 +22,7 @@ func deploymentConfirmer(ctx context.Context) { for _, deployment := range beingCreated { created := DeploymentCreated(&deployment) if created { - log.Printf("marking deployment %s as created\n", deployment.Name) + log.Printf("marking deployment %s as created\n", deployment.ID) _ = deploymentModel.New().RemoveActivity(deployment.ID, deploymentModel.ActivityBeingCreated) } } @@ -49,7 +49,7 @@ func deploymentConfirmer(ctx context.Context) { }) == -1 if allFinished { - log.Printf("marking deployment %s as deleted\n", deployment.Name) + log.Printf("marking deployment %s as deleted\n", deployment.ID) _ = deploymentModel.New().DeleteByID(deployment.ID) } } @@ -74,7 +74,7 @@ func vmConfirmer(ctx context.Context) { for _, vm := range beingCreated { created := VmCreated(&vm) if created { - log.Printf("marking vm %s as created\n", vm.Name) + log.Printf("marking vm %s as created\n", vm.ID) _ = vmModel.New().RemoveActivity(vm.ID, vmModel.ActivityBeingCreated) } } @@ -105,7 +105,7 @@ func vmConfirmer(ctx context.Context) { }) == -1 if allFinished { - log.Printf("marking vm %s as deleted\n", vm.Name) + log.Printf("marking vm %s as deleted\n", vm.ID) _ = vmModel.New().DeleteByID(vm.ID) } } diff --git a/pkg/workers/repair/workers.go b/pkg/workers/repair/workers.go index 1a2a5678..2284f7f4 100644 --- a/pkg/workers/repair/workers.go +++ b/pkg/workers/repair/workers.go @@ -49,7 +49,7 @@ func deploymentRepairer(ctx context.Context) { for _, deployment := range withNoActivities { now := time.Now() if now.Sub(deployment.RepairedAt) > 5*time.Minute { - log.Printf("repairing deployment %s\n", deployment.Name) + log.Println("repairing deployment", deployment.ID) jobID := uuid.New().String() err = job_service.Create(jobID, deployment.OwnerID, jobModel.TypeRepairDeployment, map[string]interface{}{ @@ -125,7 +125,7 @@ func vmRepairer(ctx context.Context) { for _, vm := range withNoActivities { now := time.Now() if now.Sub(vm.RepairedAt) > 5*time.Minute { - log.Printf("repairing vm %s\n", vm.Name) + log.Println("repairing vm", vm.ID) jobID := uuid.New().String() err = job_service.Create(jobID, vm.OwnerID, jobModel.TypeRepairVM, map[string]interface{}{