cmd/coordinator/internal/legacydash: add LUCI build result support

The better way to do this would've been to separate the display logic
from database reading/writing logic. But that's what the incomplete
dashboard v2 attempt is about. It's a bit too late to try to do more
here, so instead try to make minimal changes to get the job done and
make it easier to be confident it won't break existing functionality.

For golang/go#65913.

Change-Id: I8c43c25759929c8bb2c4bb18613258f4401577f9
Reviewed-on: https://go-review.googlesource.com/c/build/+/567577
Reviewed-by: Dmitri Shuralyov <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>
Auto-Submit: Dmitri Shuralyov <[email protected]>
Reviewed-by: Michael Knyszek <[email protected]>

Author: dmitshur

cmd/coordinator/coordinator.go

@@ -360,7 +360,7 @@ func main() {
 	// grpcServer is a shared gRPC server. It is global, as it needs to be used in places that aren't factored otherwise.
 	grpcServer := grpc.NewServer(opts...)
 
-	dashV1 := legacydash.Handler(gce.GoDSClient(), maintnerClient, string(masterKey()), grpcServer)
+	dashV1 := legacydash.Handler(gce.GoDSClient(), maintnerClient, nil, string(masterKey()), grpcServer)
 	dashV2 := &builddash.Handler{Datastore: gce.GoDSClient(), Maintner: maintnerClient}
 	gs := &gRPCServer{dashboardURL: "https://build.golang.org"}
 	setSessionPool(sp)

cmd/coordinator/internal/legacydash/build.go

@@ -138,6 +138,8 @@ type Commit struct {
 	// For non-Go commits, only the Results for the current Go tip, weekly,
 	// and release Tags are stored here. This is purely de-normalized data.
 	// The complete data set is stored in Result entities.
+	//
+	// Each string is formatted as builder|OK|LogHash|GoHash.
 	ResultData []string `datastore:",noindex"`
 }
 
@@ -225,49 +227,66 @@ func min(a, b int) int {
 //
 // For the main Go repo, goHash is the empty string.
 func (c *Commit) Result(builder, goHash string) *Result {
-	return result(c.ResultData, c.Hash, c.PackagePath, builder, goHash)
+	r := result(c.ResultData, c.Hash, c.PackagePath, builder, goHash)
+	if r == nil {
+		return nil
+	}
+	return &r.Result
 }
 
 // Result returns the build Result for this commit for the given builder/goHash.
 //
 // For the main Go repo, goHash is the empty string.
-func (c *CommitInfo) Result(builder, goHash string) *Result {
+func (c *CommitInfo) Result(builder, goHash string) *DisplayResult {
 	if r := result(c.ResultData, c.Hash, c.PackagePath, builder, goHash); r != nil {
 		return r
 	}
 	if u, ok := c.BuildingURLs[builderAndGoHash{builder, goHash}]; ok {
-		return &Result{
+		return &DisplayResult{Result: Result{
 			Builder:     builder,
 			BuildingURL: u,
 			Hash:        c.Hash,
 			GoHash:      goHash,
-		}
+		}}
 	}
 	if fakeResults {
 		// Create a fake random result.
 		switch rand.Intn(3) {
 		default:
 			return nil
 		case 1:
-			return &Result{
+			return &DisplayResult{Result: Result{
 				Builder: builder,
 				Hash:    c.Hash,
 				GoHash:  goHash,
 				OK:      true,
-			}
+			}}
 		case 2:
-			return &Result{
+			return &DisplayResult{Result: Result{
 				Builder: builder,
 				Hash:    c.Hash,
 				GoHash:  goHash,
 				LogHash: "fakefailureurl",
-			}
+			}}
 		}
 	}
 	return nil
 }
 
-func result(resultData []string, hash, packagePath, builder, goHash string) *Result {
+type DisplayResult struct {
+	Result
+	Noise bool
+}
+
+func (r *DisplayResult) LogURL() string {
+	if strings.HasPrefix(r.LogHash, "https://") {
+		return r.LogHash
+	} else {
+		return "/log/" + r.LogHash
+	}
+}
+
+func result(resultData []string, hash, packagePath, builder, goHash string) *DisplayResult {
 	for _, r := range resultData {
 		if !strings.HasPrefix(r, builder) {
 			// Avoid strings.SplitN alloc in the common case.
@@ -292,6 +311,14 @@ func result(resultData []string, hash, packagePath, builder, goHash string) *Res
 // As a special case, "tip" is an alias for "master", since this app
 // still uses a bunch of hg terms from when we used hg.
 func isUntested(builder, repo, branch, goBranch string) bool {
+	if strings.HasSuffix(builder, "-🐇") {
+		// LUCI builders are never considered untested.
+		//
+		// Note: It would be possible to improve this by reporting
+		// whether a given LUCI builder exists for a given x/ repo.
+		// That needs more bookkeeping and code, so left for later.
+		return false
+	}
 	if branch == "tip" {
 		branch = "master"
 	}
@@ -320,8 +347,8 @@ func knownIssue(builder string) int {
 	return 0
 }
 
-// Results returns the build Results for this Commit.
-func (c *CommitInfo) Results() (results []*Result) {
+// Results returns the build results for this Commit.
+func (c *CommitInfo) Results() (results []*DisplayResult) {
 	for _, r := range c.ResultData {
 		p := strings.SplitN(r, "|", 4)
 		if len(p) != 4 {
@@ -376,15 +403,18 @@ func reverse(s []string) {
 	}
 }
 
-// partsToResult creates a Result from ResultData substrings.
-func partsToResult(hash, packagePath string, p []string) *Result {
-	return &Result{
-		Builder:     p[0],
-		Hash:        hash,
-		PackagePath: packagePath,
-		GoHash:      p[3],
-		OK:          p[1] == "true",
-		LogHash:     p[2],
+// partsToResult creates a DisplayResult from ResultData substrings.
+func partsToResult(hash, packagePath string, p []string) *DisplayResult {
+	return &DisplayResult{
+		Result: Result{
+			Builder:     p[0],
+			Hash:        hash,
+			PackagePath: packagePath,
+			GoHash:      p[3],
+			OK:          p[1] == "true",
+			LogHash:     p[2],
+		},
+		Noise: p[1] == "infra_failure",
 	}
 }
 

cmd/coordinator/internal/legacydash/dash.go

@@ -19,11 +19,16 @@ import (
 
 	"cloud.google.com/go/datastore"
 	"github.com/NYTimes/gziphandler"
+	"golang.org/x/build/cmd/coordinator/internal/lucipoll"
 	"golang.org/x/build/maintner/maintnerd/apipb"
 	"golang.org/x/build/repos"
 	"google.golang.org/grpc"
 )
 
+type luciClient interface {
+	PostSubmitSnapshot() lucipoll.Snapshot
+}
+
 type handler struct {
 	mux *http.ServeMux
 
@@ -34,6 +39,9 @@ type handler struct {
 	// Maintner client for the maintner service.
 	// Typically the one at maintner.golang.org.
 	maintnerCl apipb.MaintnerServiceClient
+
+	// LUCI is a client for LUCI, used for fetching build results from there.
+	LUCI luciClient
 }
 
 func (h handler) ServeHTTP(w http.ResponseWriter, req *http.Request) { h.mux.ServeHTTP(w, req) }
@@ -43,11 +51,12 @@ const fakeResults = false
 
 // Handler sets a datastore client, maintner client, builder master key and
 // GRPC server at the package scope, and returns an HTTP mux for the legacy dashboard.
-func Handler(dc *datastore.Client, mc apipb.MaintnerServiceClient, key string, grpcServer *grpc.Server) http.Handler {
+func Handler(dc *datastore.Client, mc apipb.MaintnerServiceClient, lc luciClient, key string, grpcServer *grpc.Server) http.Handler {
 	h := handler{
 		mux:         http.NewServeMux(),
 		datastoreCl: dc,
 		maintnerCl:  mc,
+		LUCI:        lc,
 	}
 	kc := keyCheck{masterKey: key}