data mover ms node agent resume

Signed-off-by: Lyndon-Li <[email protected]>
vmware-tanzu · Aug 12, 2024 · 04db3ba · 04db3ba
1 parent 2c7047a
commit 04db3ba
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/pkg/builder/data_download_builder.go b/pkg/builder/data_download_builder.go
@@ -130,7 +130,7 @@ func (d *DataDownloadBuilder) CompletionTimestamp(completionTimestamp *metav1.Ti
 	return d
 }
 
-// Labels sets the DataDownload's Progress.
+// Progress sets the DataDownload's Progress.
 func (d *DataDownloadBuilder) Progress(progress shared.DataMoveOperationProgress) *DataDownloadBuilder {
 	d.object.Status.Progress = progress
 	return d

diff --git a/pkg/builder/data_upload_builder.go b/pkg/builder/data_upload_builder.go
@@ -133,7 +133,7 @@ func (d *DataUploadBuilder) Labels(labels map[string]string) *DataUploadBuilder
 	return d
 }
 
-// Labels sets the DataUpload's Progress.
+// Progress sets the DataUpload's Progress.
 func (d *DataUploadBuilder) Progress(progress shared.DataMoveOperationProgress) *DataUploadBuilder {
 	d.object.Status.Progress = progress
 	return d

diff --git a/pkg/cmd/cli/nodeagent/server.go b/pkg/cmd/cli/nodeagent/server.go
@@ -312,6 +312,8 @@ func (s *nodeAgentServer) run() {
 		if err := dataDownloadReconciler.AttemptDataDownloadResume(s.ctx, s.mgr.GetClient(), s.logger.WithField("node", s.nodeName), s.namespace); err != nil {
 			s.logger.WithError(errors.WithStack(err)).Error("failed to attempt data download resume")
 		}
+
+		s.logger.Info("Attempt complete to resume dataUploads and dataDownloads")
 	}()
 
 	s.logger.Info("Controllers starting...")

diff --git a/pkg/controller/data_download_controller.go b/pkg/controller/data_download_controller.go
@@ -864,7 +864,7 @@ func (r *DataDownloadReconciler) resumeCancellableDataPath(ctx context.Context,
 	if err := asyncBR.StartRestore(dd.Spec.SnapshotID, datapath.AccessPoint{
 		ByPath: res.ByPod.VolumeName,
 	}, nil); err != nil {
-		return errors.Wrapf(err, "error to resume asyncBR watche for dd %s", dd.Name)
+		return errors.Wrapf(err, "error to resume asyncBR watcher for dd %s", dd.Name)
 	}
 
 	resumeComplete = true

diff --git a/pkg/controller/data_download_controller_test.go b/pkg/controller/data_download_controller_test.go
@@ -1135,7 +1135,7 @@ func TestResumeCancellableRestore(t *testing.T) {
 			mockStart:       true,
 			mockClose:       true,
 			startWatcherErr: errors.New("fake-start-watcher-error"),
-			expectedError:   fmt.Sprintf("error to resume asyncBR watche for dd %s: fake-start-watcher-error", dataDownloadName),
+			expectedError:   fmt.Sprintf("error to resume asyncBR watcher for dd %s: fake-start-watcher-error", dataDownloadName),
 		},
 		{
 			name: "succeed",

diff --git a/pkg/controller/data_upload_controller.go b/pkg/controller/data_upload_controller.go
@@ -968,7 +968,7 @@ func (r *DataUploadReconciler) resumeCancellableDataPath(ctx context.Context, du
 	if err := asyncBR.StartBackup(datapath.AccessPoint{
 		ByPath: res.ByPod.VolumeName,
 	}, du.Spec.DataMoverConfig, nil); err != nil {
-		return errors.Wrapf(err, "error to resume asyncBR watche for du %s", du.Name)
+		return errors.Wrapf(err, "error to resume asyncBR watcher for du %s", du.Name)
 	}
 
 	resumeComplete = true

diff --git a/pkg/controller/data_upload_controller_test.go b/pkg/controller/data_upload_controller_test.go
@@ -1218,7 +1218,7 @@ func TestResumeCancellableBackup(t *testing.T) {
 			mockStart:       true,
 			mockClose:       true,
 			startWatcherErr: errors.New("fake-start-watcher-error"),
-			expectedError:   fmt.Sprintf("error to resume asyncBR watche for du %s: fake-start-watcher-error", dataUploadName),
+			expectedError:   fmt.Sprintf("error to resume asyncBR watcher for du %s: fake-start-watcher-error", dataUploadName),
 		},
 		{
 			name: "succeed",