From 4be1ea3506442968797b365deed2a56b951d7371 Mon Sep 17 00:00:00 2001 From: Pasha Sviderski Date: Tue, 23 Dec 2025 19:49:21 +1000 Subject: [PATCH] fix: machine name for failed machines in 'uc ps' --- cmd/uncloud/ps.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/uncloud/ps.go b/cmd/uncloud/ps.go index b4730924..bd7c11e8 100644 --- a/cmd/uncloud/ps.go +++ b/cmd/uncloud/ps.go @@ -205,18 +205,12 @@ func collectContainers(ctx context.Context, cli *client.Client) ([]containerInfo var containers []containerInfo for _, msc := range machineContainers { - machineName := "unknown" - // Metadata can be nil if the request was broadcasted to only one machine. if msc.Metadata == nil && len(machineContainers) > 1 { return nil, fmt.Errorf("something went wrong with gRPC proxy: metadata is missing for a machine response") } - if msc.Metadata != nil && msc.Metadata.Error != "" { - client.PrintWarning(fmt.Sprintf("failed to list containers on machine %s: %s", machineName, - msc.Metadata.Error)) - continue - } + machineName := "unknown" if msc.Metadata != nil { var ok bool machineName, ok = machinesNamesByIP[msc.Metadata.Machine] @@ -231,6 +225,12 @@ func collectContainers(ctx context.Context, cli *client.Client) ([]containerInfo } } + if msc.Metadata != nil && msc.Metadata.Error != "" { + client.PrintWarning(fmt.Sprintf("failed to list containers on machine %s: %s", machineName, + msc.Metadata.Error)) + continue + } + for _, ctr := range msc.Containers { if ctr.Container.State == nil || ctr.Container.Config == nil { continue