From 903458b61b7831f2b0609b6a8e6e9e92e2ae29a6 Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Thu, 1 Aug 2024 14:58:19 +0800 Subject: [PATCH] data mover ms new controller Signed-off-by: Lyndon-Li --- changelogs/unreleased/8074-Lyndon-Li | 1 + pkg/controller/data_download_controller.go | 12 +++++++++--- pkg/controller/data_upload_controller.go | 12 +++++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 changelogs/unreleased/8074-Lyndon-Li diff --git a/changelogs/unreleased/8074-Lyndon-Li b/changelogs/unreleased/8074-Lyndon-Li new file mode 100644 index 0000000000..ea7acad683 --- /dev/null +++ b/changelogs/unreleased/8074-Lyndon-Li @@ -0,0 +1 @@ +Data mover micro service DUCR/DDCR controller refactor according to design #7576 \ No newline at end of file diff --git a/pkg/controller/data_download_controller.go b/pkg/controller/data_download_controller.go index abb1da2ae9..f0c0c1728d 100644 --- a/pkg/controller/data_download_controller.go +++ b/pkg/controller/data_download_controller.go @@ -349,7 +349,9 @@ func (r *DataDownloadReconciler) runCancelableDataPath(ctx context.Context, asyn } func (r *DataDownloadReconciler) OnDataDownloadCompleted(ctx context.Context, namespace string, ddName string, result datapath.Result) { - defer r.closeDataPath(ctx, ddName) + defer func() { + go r.closeDataPath(ctx, ddName) + }() log := r.logger.WithField("datadownload", ddName) log.Info("Async fs restore data path completed") @@ -382,7 +384,9 @@ func (r *DataDownloadReconciler) OnDataDownloadCompleted(ctx context.Context, na } func (r *DataDownloadReconciler) OnDataDownloadFailed(ctx context.Context, namespace string, ddName string, err error) { - defer r.closeDataPath(ctx, ddName) + defer func() { + go r.closeDataPath(ctx, ddName) + }() log := r.logger.WithField("datadownload", ddName) @@ -399,7 +403,9 @@ func (r *DataDownloadReconciler) OnDataDownloadFailed(ctx context.Context, names } func (r *DataDownloadReconciler) OnDataDownloadCancelled(ctx context.Context, namespace string, ddName string) { - defer r.closeDataPath(ctx, ddName) + defer func() { + go r.closeDataPath(ctx, ddName) + }() log := r.logger.WithField("datadownload", ddName) diff --git a/pkg/controller/data_upload_controller.go b/pkg/controller/data_upload_controller.go index 7cc7ee41c2..91413a8ccf 100644 --- a/pkg/controller/data_upload_controller.go +++ b/pkg/controller/data_upload_controller.go @@ -360,7 +360,9 @@ func (r *DataUploadReconciler) runCancelableDataUpload(ctx context.Context, asyn } func (r *DataUploadReconciler) OnDataUploadCompleted(ctx context.Context, namespace string, duName string, result datapath.Result) { - defer r.closeDataPath(ctx, duName) + defer func() { + go r.closeDataPath(ctx, duName) + }() log := r.logger.WithField("dataupload", duName) @@ -404,7 +406,9 @@ func (r *DataUploadReconciler) OnDataUploadCompleted(ctx context.Context, namesp } func (r *DataUploadReconciler) OnDataUploadFailed(ctx context.Context, namespace, duName string, err error) { - defer r.closeDataPath(ctx, duName) + defer func() { + go r.closeDataPath(ctx, duName) + }() log := r.logger.WithField("dataupload", duName) @@ -421,7 +425,9 @@ func (r *DataUploadReconciler) OnDataUploadFailed(ctx context.Context, namespace } func (r *DataUploadReconciler) OnDataUploadCancelled(ctx context.Context, namespace string, duName string) { - defer r.closeDataPath(ctx, duName) + defer func() { + go r.closeDataPath(ctx, duName) + }() log := r.logger.WithField("dataupload", duName)