commit 5e3904fd35082e6f3bfe20e5a6475870b8da6057
author Carlos Amedee <carlos@golang.org> Thu Sep 07 10:59:09 2023 -0400
committer Gopher Robot <gobot@golang.org> Thu Sep 07 19:02:08 2023 +0000
tree b42cc7adefdffa3b9655089e5676947176d2fdd6
parent 528629c29f4d5907b3fb5f55de4f781936e6e913

cmd/gomoteserver: use the gomote swarming GRPC server

Fixes golang/go#61912

Change-Id: Ie7f7ef8fc53bb2607e461c71e123e289292c1d00
Reviewed-on: https://go-review.googlesource.com/c/build/+/526260
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Carlos Amedee <carlos@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>

cmd/gomoteserver/gomoteserver.go

diff --git a/cmd/gomoteserver/gomoteserver.go b/cmd/gomoteserver/gomoteserver.go
index 5dcc4b7..1493348 100644
--- a/cmd/gomoteserver/gomoteserver.go
+++ b/cmd/gomoteserver/gomoteserver.go
@@ -21,7 +21,6 @@
 	"golang.org/x/build/internal/access"
 	"golang.org/x/build/internal/coordinator/pool"
 	"golang.org/x/build/internal/coordinator/remote"
-	"golang.org/x/build/internal/coordinator/schedule"
 	"golang.org/x/build/internal/gomote"
 	gomotepb "golang.org/x/build/internal/gomote/protos"
 	"golang.org/x/build/internal/https"
@@ -38,15 +37,15 @@
 )
 
 func main() {
-	log.Println("starting gomote server")
 	https.RegisterFlags(flag.CommandLine)
 	flag.Parse()
 	if err := secret.InitFlagSupport(context.Background()); err != nil {
 		log.Fatalln(err)
 	}
+	log.Println("starting gomote server")
+
 	sp := remote.NewSessionPool(context.Background())
 	sshCA := mustRetrieveSSHCertificateAuthority()
-	var sched = schedule.NewScheduler()
 
 	var gomoteBucket string
 	var opts []grpc.ServerOption
@@ -65,7 +64,10 @@
 		opts = append(opts, grpc.StreamInterceptor(access.RequireIAPAuthStreamInterceptor(access.IAPSkipAudienceValidation)))
 	}
 	grpcServer := grpc.NewServer(opts...)
-	gomoteServer := gomote.New(sp, sched, sshCA, gomoteBucket, mustStorageClient(), mustLUCIConfigClient())
+	gomoteServer, err := gomote.NewSwarming(sp, sshCA, gomoteBucket, mustStorageClient(), mustLUCIConfigClient())
+	if err != nil {
+		log.Fatalf("unable to create gomote server: %s", err)
+	}
 	gomotepb.RegisterGomoteServiceServer(grpcServer, gomoteServer)
 
 	mux := http.NewServeMux()