From dbd1a12d9f224f80eb1cf9105c1602e18b25fbd6 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Tue, 28 Nov 2023 10:39:16 +0800 Subject: [PATCH] Add nilerr and ginkgolinter linter. Signed-off-by: Xun Jiang --- golangci.yaml | 2 ++ pkg/controller/data_download_controller.go | 1 + pkg/podvolume/restorer.go | 1 + 3 files changed, 4 insertions(+) diff --git a/golangci.yaml b/golangci.yaml index 3e6a8b568..48353ef6f 100644 --- a/golangci.yaml +++ b/golangci.yaml @@ -328,6 +328,8 @@ linters: - whitespace - dupword - errchkjson + - ginkgolinter + - nilerr fast: false diff --git a/pkg/controller/data_download_controller.go b/pkg/controller/data_download_controller.go index 065c48a5f..e09bac1f5 100644 --- a/pkg/controller/data_download_controller.go +++ b/pkg/controller/data_download_controller.go @@ -151,6 +151,7 @@ func (r *DataDownloadReconciler) Reconcile(ctx context.Context, req ctrl.Request log.Info("Data download starting") if _, err := r.getTargetPVC(ctx, dd); err != nil { + log.WithField("error", err).Debugf("Cannot find target PVC for DataDownload yet. Retry later.") return ctrl.Result{Requeue: true}, nil } diff --git a/pkg/podvolume/restorer.go b/pkg/podvolume/restorer.go index d54a7e66c..e88f70432 100644 --- a/pkg/podvolume/restorer.go +++ b/pkg/podvolume/restorer.go @@ -199,6 +199,7 @@ func (r *restorer) RestorePodVolumes(data RestoreData) []error { err = kube.IsPodScheduled(newObj) if err != nil { + r.log.WithField("error", err).Debugf("Pod %s/%s is not scheduled yet", newObj.GetNamespace(), newObj.GetName()) return false, nil } return true, nil