From 0fc822b790ea9f472f96b82794cc326853cacce8 Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Tue, 12 Nov 2024 18:29:41 +0800 Subject: [PATCH] issue 8391: check ErrCancelled from suffix Signed-off-by: Lyndon-Li --- changelogs/unreleased/8404-Lyndon-Li | 1 + pkg/datapath/micro_service_watcher.go | 3 ++- pkg/datapath/micro_service_watcher_test.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/8404-Lyndon-Li diff --git a/changelogs/unreleased/8404-Lyndon-Li b/changelogs/unreleased/8404-Lyndon-Li new file mode 100644 index 0000000000..f6baf0a187 --- /dev/null +++ b/changelogs/unreleased/8404-Lyndon-Li @@ -0,0 +1 @@ +Fix issue #8391, check ErrCancelled from suffix of data mover pod's termination message \ No newline at end of file diff --git a/pkg/datapath/micro_service_watcher.go b/pkg/datapath/micro_service_watcher.go index d211996189..8d09275389 100644 --- a/pkg/datapath/micro_service_watcher.go +++ b/pkg/datapath/micro_service_watcher.go @@ -20,6 +20,7 @@ import ( "context" "encoding/json" "os" + "strings" "sync" "time" @@ -321,7 +322,7 @@ func (ms *microServiceBRWatcher) startWatch() { if lastPod.Status.Phase == v1.PodSucceeded { ms.callbacks.OnCompleted(ms.ctx, ms.namespace, ms.taskName, funcGetResultFromMessage(ms.taskType, terminateMessage, ms.log)) } else { - if terminateMessage == ErrCancelled { + if strings.HasSuffix(terminateMessage, ErrCancelled) { ms.callbacks.OnCancelled(ms.ctx, ms.namespace, ms.taskName) } else { ms.callbacks.OnFailed(ms.ctx, ms.namespace, ms.taskName, errors.New(terminateMessage)) diff --git a/pkg/datapath/micro_service_watcher_test.go b/pkg/datapath/micro_service_watcher_test.go index ea3e31e074..de71a0e9e8 100644 --- a/pkg/datapath/micro_service_watcher_test.go +++ b/pkg/datapath/micro_service_watcher_test.go @@ -360,7 +360,7 @@ func TestStartWatch(t *testing.T) { event: &v1.Event{Reason: EventReasonStopped}, }, }, - terminationMessage: ErrCancelled, + terminationMessage: fmt.Sprintf("Failed to init data path service for DataUpload %s: %v", "fake-du-name", errors.New(ErrCancelled)), expectStartEvent: true, expectTerminateEvent: true, expectCancel: true,