From 63ebd4e51b227beea9408784d2970b2d4ca751d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wenkai=20Yin=28=E5=B0=B9=E6=96=87=E5=BC=80=29?= Date: Sat, 26 Jul 2025 00:31:55 +0800 Subject: [PATCH] Return error if timeout when checking server version (#9111) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return error if timeout when checking server version Fixes #8620 Signed-off-by: Wenkai Yin(尹文开) --- changelogs/unreleased/9111-ywk253100 | 1 + pkg/cmd/cli/serverstatus/server_status.go | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/9111-ywk253100 diff --git a/changelogs/unreleased/9111-ywk253100 b/changelogs/unreleased/9111-ywk253100 new file mode 100644 index 000000000..1b5408f0b --- /dev/null +++ b/changelogs/unreleased/9111-ywk253100 @@ -0,0 +1 @@ +Return error if timeout when checking server version \ No newline at end of file diff --git a/pkg/cmd/cli/serverstatus/server_status.go b/pkg/cmd/cli/serverstatus/server_status.go index 628c4a545..ab994e2d6 100644 --- a/pkg/cmd/cli/serverstatus/server_status.go +++ b/pkg/cmd/cli/serverstatus/server_status.go @@ -69,5 +69,11 @@ func (g *DefaultServerStatusGetter) GetServerStatus(kbClient kbclient.Client) (* wait.Until(checkFunc, 250*time.Millisecond, ctx.Done()) - return created, nil + err := ctx.Err() + // context.Canceled error means we have received a processed ServerStatusRequest + if err == context.Canceled { + err = nil + } + + return created, err }