From 3975b33706d85857e8d7a8ec2677edbb35984a14 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 8 Jun 2021 01:53:12 -0400 Subject: [PATCH 1/1] 17609: Behave better when project creation fails. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/diagnostics/cmd.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/diagnostics/cmd.go b/lib/diagnostics/cmd.go index 2f43263e5c..1c7b98baf7 100644 --- a/lib/diagnostics/cmd.go +++ b/lib/diagnostics/cmd.go @@ -31,7 +31,7 @@ func (cmd Command) RunCommand(prog string, args []string, stdin io.Reader, stdou f.StringVar(&diag.logLevel, "log-level", "info", "logging level (debug, info, warning, error)") f.BoolVar(&diag.checkInternal, "internal-client", false, "check that this host is considered an \"internal\" client") f.BoolVar(&diag.checkExternal, "external-client", false, "check that this host is considered an \"external\" client") - f.IntVar(&diag.priority, "priority", 500, "priority for test container (1..1000)") + f.IntVar(&diag.priority, "priority", 500, "priority for test container (1..1000, or 0 to skip)") f.DurationVar(&diag.timeout, "timeout", 10*time.Second, "timeout for http requests") err := f.Parse(args) if err == flag.ErrHelp { @@ -334,13 +334,17 @@ func (diag *diagnoser) runtests() { var collection arvados.Collection diag.dotest(90, "creating temporary collection", func() error { + if project.UUID == "" { + return fmt.Errorf("skipping, no project to work in") + } ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(diag.timeout)) defer cancel() err := client.RequestAndDecodeContext(ctx, &collection, "POST", "arvados/v1/collections", nil, map[string]interface{}{ "ensure_unique_name": true, "collection": map[string]interface{}{ - "name": "test collection", - "trash_at": time.Now().Add(time.Hour)}}) + "owner_uuid": project.UUID, + "name": "test collection", + "trash_at": time.Now().Add(time.Hour)}}) if err != nil { return err } @@ -532,6 +536,9 @@ func (diag *diagnoser) runtests() { diag.debugf("skipping, caller requested priority<1 (%d)", diag.priority) return nil } + if project.UUID == "" { + return fmt.Errorf("skipping, no project to work in") + } var cr arvados.ContainerRequest ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(diag.timeout)) -- 2.30.2