upstream/terraform
1
0
Fork 0
mirror of https://github.com/hashicorp/terraform.git synced 2026-06-09 00:42:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix server startup panics

Browse source
This commit is contained in:
UKEME BASSEY 2025-05-12 19:01:11 -04:00
parent a732b606a1
commit 25b5607b7b
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
internal/rpcapi/stacks_grpc_client.go
View file

@ -8,6 +8,7 @@ import (
"fmt"
"io"
"log"
"sync"
"github.com/hashicorp/go-plugin"
"github.com/hashicorp/terraform-svchost/disco"
@ -47,12 +48,16 @@ func (c GRPCStacksClient) registerBrokers(stdout, stderr io.Writer) brokerIDs {
packagesServer := dynrpcserver.NewPackagesStub()
stacksServer := dynrpcserver.NewStacksStub()
var s *grpc.Server
var serverWG sync.WaitGroup
// wait for all 3 servers to start
serverWG.Add(3)
dependenciesServerFunc := func(opts []grpc.ServerOption) *grpc.Server {
s = grpc.NewServer(opts...)
s := grpc.NewServer(opts...)
dependencies.RegisterDependenciesServer(s, dependenciesServer)
dependenciesServer.ActivateRPCServer(newDependenciesServer(handles, c.Services))
serverWG.Done()
return s
}
@ -60,10 +65,11 @@ func (c GRPCStacksClient) registerBrokers(stdout, stderr io.Writer) brokerIDs {
go c.Broker.AcceptAndServe(dependenciesBrokerID, dependenciesServerFunc)
packagesServerFunc := func(opts []grpc.ServerOption) *grpc.Server {
s = grpc.NewServer(opts...)
s := grpc.NewServer(opts...)
packages.RegisterPackagesServer(s, packagesServer)
packagesServer.ActivateRPCServer(newPackagesServer(c.Services))
serverWG.Done()
return s
}
@ -71,16 +77,21 @@ func (c GRPCStacksClient) registerBrokers(stdout, stderr io.Writer) brokerIDs {
go c.Broker.AcceptAndServe(packagesBrokerID, packagesServerFunc)
stacksServerFunc := func(opts []grpc.ServerOption) *grpc.Server {
s = grpc.NewServer(opts...)
s := grpc.NewServer(opts...)
stacks.RegisterStacksServer(s, stacksServer)
stacksServer.ActivateRPCServer(newStacksServer(
newStopper(), handles, c.Services, &serviceOpts{experimentsAllowed: true}))
serverWG.Done()
return s
}
stacksBrokerID := c.Broker.NextId()
go c.Broker.AcceptAndServe(stacksBrokerID, stacksServerFunc)
// block till all 3 servers have signaled readiness
serverWG.Wait()
return brokerIDs{
dependenciesBrokerID: dependenciesBrokerID,
packagesBrokerID: packagesBrokerID,