From 1afb9879f08df8f4d57cefcea835e683a0153deb Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 5 Apr 2023 14:06:25 -0400 Subject: [PATCH] 18790: Improve error messages. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-client/container_gateway.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cmd/arvados-client/container_gateway.go b/cmd/arvados-client/container_gateway.go index f4d0e1e4b5..86af6be583 100644 --- a/cmd/arvados-client/container_gateway.go +++ b/cmd/arvados-client/container_gateway.go @@ -211,7 +211,8 @@ func (lc *logsCommand) copyRange(ctx context.Context, uuid, fnm, byterange strin return 0, 0, nil } if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusPartialContent { - return 0, 0, fmt.Errorf("error getting %s: %s", fnm, resp.Status) + body, _ := io.ReadAll(io.LimitReader(resp.Body, 10000)) + return 0, 0, fmt.Errorf("error getting %s: HTTP %s -- %s", fnm, resp.Status, bytes.TrimSuffix(body, []byte{'\n'})) } var rstart, rend, rsize int64 _, err = fmt.Sscanf(resp.Header.Get("Content-Range"), "bytes %d-%d/%d", &rstart, &rend, &rsize) @@ -422,22 +423,22 @@ func rpcFromEnv() *rpc.Conn { func resolveToContainerUUID(rpcconn *rpc.Conn, targetUUID string) (string, error) { switch { - case strings.Contains(targetUUID, "-dz642-"): + case strings.Contains(targetUUID, "-dz642-") && len(targetUUID) == 27: return targetUUID, nil - case strings.Contains(targetUUID, "-xvhdp-"): + case strings.Contains(targetUUID, "-xvhdp-") && len(targetUUID) == 27: crs, err := rpcconn.ContainerRequestList(context.TODO(), arvados.ListOptions{Limit: -1, Filters: []arvados.Filter{{"uuid", "=", targetUUID}}}) if err != nil { return "", err } if len(crs.Items) < 1 { - return "", fmt.Errorf("container request %q not found\n", targetUUID) + return "", fmt.Errorf("container request %q not found", targetUUID) } cr := crs.Items[0] if cr.ContainerUUID == "" { - return "", fmt.Errorf("no container assigned, container request state is %s\n", strings.ToLower(string(cr.State))) + return "", fmt.Errorf("no container assigned, container request state is %s", strings.ToLower(string(cr.State))) } return cr.ContainerUUID, nil default: - return "", fmt.Errorf("target UUID is not a container or container request UUID: %s\n", targetUUID) + return "", fmt.Errorf("target UUID is not a container or container request UUID: %s", targetUUID) } } -- 2.30.2