From cd8220c8966d0e07902d4ac123c42865103857aa Mon Sep 17 00:00:00 2001 From: Phan Le Date: Mon, 22 Jul 2024 19:52:38 -0700 Subject: [PATCH] Fix Derek's review comments longhorn-6205 Signed-off-by: Phan Le --- app/daemon.go | 5 ++++- controller/node_controller.go | 2 +- controller/replica_controller.go | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/daemon.go b/app/daemon.go index afd62d624f..b7d7a1be09 100644 --- a/app/daemon.go +++ b/app/daemon.go @@ -174,7 +174,10 @@ func startManager(c *cli.Context) error { } // This adds the label for the conversion webhook's selector. We do it the hard way without datastore to avoid chicken-and-egg. - pod, _ := clientsWithoutDatastore.Clients.K8s.CoreV1().Pods(podNamespace).Get(context.Background(), podName, v1.GetOptions{}) + pod, err := clientsWithoutDatastore.Clients.K8s.CoreV1().Pods(podNamespace).Get(context.Background(), podName, v1.GetOptions{}) + if err != nil { + return err + } labels := types.GetConversionWebhookLabel() for key, value := range labels { pod.Labels[key] = value diff --git a/controller/node_controller.go b/controller/node_controller.go index 54d658da4c..b5e444d080 100644 --- a/controller/node_controller.go +++ b/controller/node_controller.go @@ -523,7 +523,7 @@ func (nc *NodeController) syncNode(key string) (err error) { // have been turned off for RWX failover. labels := types.MergeStringMaps(types.GetAdmissionWebhookLabel(), types.GetRecoveryBackendLabel()) if err := nc.ds.AddLabelToManagerPod(node.Name, labels); err != nil { - log.Warnf("Node %v failed to restore its admission webhook and recovery backend", node.Name) + log.WithError(err).Error("Failed to restore its admission webhook and recovery backend") return err } diff --git a/controller/replica_controller.go b/controller/replica_controller.go index b727200cd9..83691ae62b 100644 --- a/controller/replica_controller.go +++ b/controller/replica_controller.go @@ -564,10 +564,10 @@ func (rc *ReplicaController) DeleteInstance(obj interface{}) (err error) { defer func() { if err != nil { log.WithError(err).Warnf("Failed to delete replica process %v", r.Name) - } - if isDelinquent { - log.Warnf("Ignored the failure of deleting replica process %v because the RWX volume is currently delinquent", r.Name) - err = nil + if isDelinquent { + log.Warnf("Ignored the failure of deleting replica process %v because the RWX volume is currently delinquent", r.Name) + err = nil + } } }()