Commit 1b557d77 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

packer/rpc: Builder.Run() no longer blocks RPC connection

parent 079d6f4d
package rpc
import (
"encoding/gob"
"github.com/mitchellh/packer/packer"
"log"
"net"
"net/rpc"
)
......@@ -23,6 +26,11 @@ type BuilderPrepareArgs struct {
type BuilderRunArgs struct {
RPCAddress string
ResponseAddress string
}
type BuilderRunResponse struct {
RPCAddress string
}
func Builder(client *rpc.Client) *builder {
......@@ -45,14 +53,38 @@ func (b *builder) Run(ui packer.Ui, hook packer.Hook) packer.Artifact {
RegisterUi(server, ui)
RegisterHook(server, hook)
args := &BuilderRunArgs{serveSingleConn(server)}
// Create a server for the response
responseL := netListenerInRange(portRangeMin, portRangeMax)
artifactAddress := make(chan string)
go func() {
defer responseL.Close()
conn, err := responseL.Accept()
if err != nil {
log.Panic(err)
}
defer conn.Close()
decoder := gob.NewDecoder(conn)
var response BuilderRunResponse
if err := decoder.Decode(&response); err != nil {
log.Panic(err)
}
artifactAddress <- response.RPCAddress
}()
var reply string
if err := b.client.Call("Builder.Run", args, &reply); err != nil {
args := &BuilderRunArgs{
serveSingleConn(server),
responseL.Addr().String(),
}
if err := b.client.Call("Builder.Run", args, new(interface{})); err != nil {
panic(err)
}
client, err := rpc.Dial("tcp", reply)
client, err := rpc.Dial("tcp", <-artifactAddress)
if err != nil {
panic(err)
}
......@@ -73,12 +105,23 @@ func (b *BuilderServer) Prepare(args *BuilderPrepareArgs, reply *error) error {
return nil
}
func (b *BuilderServer) Run(args *BuilderRunArgs, reply *string) error {
func (b *BuilderServer) Run(args *BuilderRunArgs, reply *interface{}) error {
client, err := rpc.Dial("tcp", args.RPCAddress)
if err != nil {
return err
}
responseC, err := net.Dial("tcp", args.ResponseAddress)
if err != nil {
return err
}
responseWriter := gob.NewEncoder(responseC)
// Run the build in a goroutine so we don't block the RPC connection
go func () {
defer responseC.Close()
hook := Hook(client)
ui := &Ui{client}
artifact := b.builder.Run(ui, hook)
......@@ -87,6 +130,8 @@ func (b *BuilderServer) Run(args *BuilderRunArgs, reply *string) error {
server := rpc.NewServer()
RegisterArtifact(server, artifact)
*reply = serveSingleConn(server)
responseWriter.Encode(&BuilderRunResponse{serveSingleConn(server)})
}()
return nil
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment