!331 · krz/gitbay

.gitbay/wiki/Admin.org +3 −1

 Per worker: pending, retrying (pending with a failed attempt) and
 dead-lettered counts with the oldest pending age, and the retrying or
 failed rows themselves, capped at twenty each. Builds list what is
-running and since when; mirrors list the ones whose last sync failed;
+running and then what is pending, each since when, so a build no runner
+is scoped to claim is visible here rather than only in its repository;
+mirrors list the ones whose last sync failed;
 dependency checks list the ones whose last check errored. Non-admins get
 no =queues= key at all.

e2e/adminusers_test.go +12 −1

 		Builds struct {
 			Pending       int64  `json:"pending"`
 			OldestPending string `json:"oldest_pending"`
+			Items         []struct {
+				Repo      string `json:"repo"`
+				Job       string `json:"job"`
+				Status    string `json:"status"`
+				CreatedAt string `json:"created_at"`
+			} `json:"items"`
 		} `json:"builds"`
 		Mail struct {
 			Pending int64 `json:"pending"`
 	if len(q.Webhooks.Items) == 0 || q.Webhooks.Items[0].Repo != "alice/app" || q.Webhooks.Items[0].Attempts == 0 || q.Webhooks.Items[0].LastError == "" {
 		t.Fatalf("retrying item: %+v", q.Webhooks.Items)
 	}
+	// A build no runner has claimed is listed, not just counted.
+	if len(q.Builds.Items) == 0 || q.Builds.Items[0].Repo != "alice/app" || q.Builds.Items[0].Job != "ok" ||
+		q.Builds.Items[0].Status != "pending" || q.Builds.Items[0].CreatedAt == "" {
+		t.Fatalf("pending build item: %+v", q.Builds.Items)
+	}
 	// The web page dispatches the same read; non-admins get a 404 and no
 	// rail link.
 	root := inst.login(t, rootKey)
 	status, body := browserGet(t, root, inst.base()+"/admin")
 	if status != 200 || !strings.Contains(body, "Webhook deliveries") || !strings.Contains(body, "alice/app") ||
-		!strings.Contains(body, "retrying") || !strings.Contains(body, "1 pending") {
+		!strings.Contains(body, "retrying") || !strings.Contains(body, "1 pending") || !strings.Contains(body, "<td>pending</td>") {
 		t.Fatalf("/admin: %d\n%s", status, body)
 	}
 	if _, body := browserGet(t, root, inst.base()+"/"); !strings.Contains(body, `href="/admin"`) {

internal/control/dashboard.go +5 −1

 			}
 			fmt.Fprintf(w, "  builds\tpending %d\trunning %d\n", q.Builds.Pending, q.Builds.Running)
 			for _, it := range q.Builds.Items {
-				fmt.Fprintf(w, "    %s\t%d\t%s\tsince %s\n", it.Repo, it.Number, it.Job, it.StartedAt)
+				since := it.StartedAt
+				if it.Status == "pending" {
+					since = it.CreatedAt
+				}
+				fmt.Fprintf(w, "    %s\t%d\t%s\t%s since %s\n", it.Repo, it.Number, it.Job, it.Status, since)
 			}
 			fmt.Fprintf(w, "  deps\terrors %d\n", q.Deps.Errors)
 			for _, it := range q.Deps.Items {

internal/store/queues.go +8 −5

 	Pending       int64           `json:"pending"`
 	Running       int64           `json:"running"`
 	OldestPending string          `json:"oldest_pending,omitempty"`
-	Items         []QueueBuildRow `json:"items"` // running builds, oldest first
+	Items         []QueueBuildRow `json:"items"` // running then pending, oldest first
 }
 type QueueBuildRow struct {
 	Repo      string `json:"repo"`
 	Number    int64  `json:"number"`
 	Job       string `json:"job"`
-	StartedAt string `json:"started_at"`
+	Status    string `json:"status"` // running | pending
+	CreatedAt string `json:"created_at"`
+	StartedAt string `json:"started_at"` // "" while pending
 }
 type QueueDeps struct {
 		COALESCE(MIN(created_at) FILTER (WHERE status = 'pending'), '') FROM builds`).Scan(&q.Builds.Pending, &q.Builds.Running, &q.Builds.OldestPending); err != nil {
 		return q, err
 	}
-	if err := s.queryEach(`SELECT `+repoPathExpr+`, b.number, b.job, b.started_at
+	if err := s.queryEach(`SELECT `+repoPathExpr+`, b.number, b.job, b.status, b.created_at, b.started_at
-		FROM builds b`+repoJoin("b.repo_id")+` WHERE b.status = 'running' ORDER BY b.started_at LIMIT ?`, func(sc scanner) error {
+		FROM builds b`+repoJoin("b.repo_id")+` WHERE b.status IN ('running', 'pending')
+		ORDER BY b.status = 'running' DESC, b.started_at, b.created_at, b.id LIMIT ?`, func(sc scanner) error {
 		var b QueueBuildRow
-		if err := sc.Scan(&b.Repo, &b.Number, &b.Job, &b.StartedAt); err != nil {
+		if err := sc.Scan(&b.Repo, &b.Number, &b.Job, &b.Status, &b.CreatedAt, &b.StartedAt); err != nil {
 			return err
 		}
 		q.Builds.Items = append(q.Builds.Items, b)

internal/store/queues_test.go added +48

@@ -0,0 +1,48 @@
	1	package store
	2
	3	import "testing"
	4
	5	// The build queue lists pending builds as well as running ones, so an
	6	// admin can see what no runner is claiming without walking every repo.
	7	func TestQueuesListsPendingBuilds(t *testing.T) {
	8	s := open(t)
	9	if err := s.MigrateUp(); err != nil {
	10	t.Fatal(err)
	11	}
	12	uid, err := s.CreateUser("cmc", true)
	13	if err != nil {
	14	t.Fatal(err)
	15	}
	16	if _, err := s.CreateRepo("user", uid, "orgo", "public"); err != nil {
	17	t.Fatal(err)
	18	}
	19	running, err := s.CreateBuild(1, "test", "abc123", "main", `["true"]`, "", "", true)
	20	if err != nil {
	21	t.Fatal(err)
	22	}
	23	pending, err := s.CreateBuild(1, "pages", "abc123", "main", `["true"]`, "", "", true)
	24	if err != nil {
	25	t.Fatal(err)
	26	}
	27	if _, ok, err := s.ClaimBuild(nil); err != nil \|\| !ok {
	28	t.Fatalf("claim: %v ok=%v", err, ok)
	29	}
	30
	31	q, err := s.QueueStatus()
	32	if err != nil {
	33	t.Fatal(err)
	34	}
	35	if q.Builds.Pending != 1 \|\| q.Builds.Running != 1 {
	36	t.Fatalf("counts: %+v", q.Builds)
	37	}
	38	items := q.Builds.Items
	39	if len(items) != 2 {
	40	t.Fatalf("items: %+v", items)
	41	}
	42	if items[0].Number != running \|\| items[0].Status != "running" \|\| items[0].StartedAt == "" {
	43	t.Fatalf("running row first: %+v", items[0])
	44	}
	45	if items[1].Number != pending \|\| items[1].Status != "pending" \|\| items[1].StartedAt != "" \|\| items[1].CreatedAt == "" {
	46	t.Fatalf("pending row after: %+v", items[1])
	47	}
	48	}

internal/web/templates/admin.html +3 −3

	@@ -30,9 +30,9 @@
30	{{with .Queues.Builds}}	30	{{with .Queues.Builds}}
31	<h2>Builds <span class="count">{{.Pending}}</span></h2>	31	<h2>Builds <span class="count">{{.Pending}}</span></h2>
32	<p class="meta">{{.Pending}} pending · {{.Running}} running{{if .OldestPending}} · oldest pending {{when .OldestPending}}{{end}}</p>	32	<p class="meta">{{.Pending}} pending · {{.Running}} running{{if .OldestPending}} · oldest pending {{when .OldestPending}}{{end}}</p>
33	{{if .Items}}<div class="tablewrap"><table class="keys"><thead><tr class="cols"><th>Repository</th><th>Build</th><th>Job</th><th>Running since</th></tr></thead><tbody>	33	{{if .Items}}<div class="tablewrap"><table class="keys"><thead><tr class="cols"><th>Repository</th><th>Build</th><th>Job</th><th>Status</th><th>Since</th></tr></thead><tbody>
34	{{range .Items}}<tr><td><a href="/{{.Repo}}">{{.Repo}}</a></td><td><a href="/{{.Repo}}/builds/{{.Number}}">#{{.Number}}</a></td><td>{{.Job}}</td><td>{{when .StartedAt}}</td></tr>	34	{{range .Items}}<tr><td><a href="/{{.Repo}}">{{.Repo}}</a></td><td><a href="/{{.Repo}}/builds/{{.Number}}">#{{.Number}}</a></td><td>{{.Job}}</td><td>{{.Status}}</td><td>{{if .StartedAt}}{{when .StartedAt}}{{else}}{{when .CreatedAt}}{{end}}</td></tr>
35	{{end}}</tbody></table></div>{{else}}<p class="none">No build running</p>{{end}}	35	{{end}}</tbody></table></div>{{else}}<p class="none">No build running or pending</p>{{end}}
36	{{end}}	36	{{end}}
37		37
38	{{with .Queues.Deps}}	38	{{with .Queues.Deps}}

dashboard: list pending builds in the build queue !331