20797: Update for new createrepo package+executable name

[arvados.git] / lib / service / cmd_test.go

diff --git a/lib/service/cmd_test.go b/lib/service/cmd_test.go
index 22b8415137b76fafaa54319ec4c71f6df7e9a98c..97a6bd8a4c979cd26b39c4c2cd93c75e82dbcd13 100644 (file)
--- a/lib/service/cmd_test.go
+++ b/lib/service/cmd_test.go
@@ -204,13 +204,15 @@ func (*Suite) TestDumpRequests(c *check.C) {
        defer os.Remove(cf.Name())
        defer cf.Close()
 
-       max := 1
+       max := 24
        fmt.Fprintf(cf, `
 Clusters:
  zzzzz:
   SystemRootToken: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   ManagementToken: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-  API: {MaxConcurrentRequests: %d}
+  API:
+   MaxConcurrentRequests: %d
+   MaxQueuedRequests: 0
   SystemLogs: {RequestQueueDumpDirectory: %q}
   Services:
    Controller:
@@ -268,23 +270,54 @@ Clusters:
                        panic("timed out")
                }
        }
-       for {
+       for delay := time.Second / 100; ; delay = delay * 2 {
+               time.Sleep(delay)
                j, err := os.ReadFile(tmpdir + "/arvados-controller-requests.json")
                if os.IsNotExist(err) && deadline.After(time.Now()) {
-                       time.Sleep(time.Second / 100)
                        continue
                }
-               c.Check(err, check.IsNil)
-               c.Logf("%s", stderr.String())
-               c.Logf("%s", string(j))
+               c.Assert(err, check.IsNil)
+               c.Logf("stderr:\n%s", stderr.String())
+               c.Logf("json:\n%s", string(j))
 
                var loaded []struct{ URL string }
                err = json.Unmarshal(j, &loaded)
                c.Check(err, check.IsNil)
+               if len(loaded) < max {
+                       // Dumped when #requests was >90% but <100% of
+                       // limit. If we stop now, we won't be able to
+                       // confirm (below) that management endpoints
+                       // are still accessible when normal requests
+                       // are at 100%.
+                       c.Logf("loaded dumped requests, but len %d < max %d -- still waiting", len(loaded), max)
+                       continue
+               }
                c.Check(loaded, check.HasLen, max)
                c.Check(loaded[0].URL, check.Equals, "/testpath")
                break
        }
+
+       for _, path := range []string{"/_inspect/requests", "/metrics"} {
+               req, err := http.NewRequest("GET", "http://localhost:12345"+path, nil)
+               c.Assert(err, check.IsNil)
+               req.Header.Set("Authorization", "Bearer bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb")
+               resp, err := client.Do(req)
+               if !c.Check(err, check.IsNil) {
+                       break
+               }
+               c.Logf("got response for %s", path)
+               c.Check(resp.StatusCode, check.Equals, http.StatusOK)
+               buf, err := ioutil.ReadAll(resp.Body)
+               c.Check(err, check.IsNil)
+               switch path {
+               case "/metrics":
+                       c.Check(string(buf), check.Matches, `(?ms).*arvados_concurrent_requests `+fmt.Sprintf("%d", max)+`\n.*`)
+               case "/_inspect/requests":
+                       c.Check(string(buf), check.Matches, `(?ms).*"URL":"/testpath".*`)
+               default:
+                       c.Error("oops, testing bug")
+               }
+       }
        close(hold)
        cancel()