Cleanup handshake naming in agent

agent-api/types.go

@@ -9,19 +9,22 @@ import (
 	"github.com/nats-io/nats.go"
 )
 
-// NexExecutionProviderELF Executable Linkable Format execution provider
+// Agent handshake subject
+const NexAgentSubjectHandshake = "agentint.handshake"
+
+// Executable Linkable Format execution provider
 const NexExecutionProviderELF = "elf"
 
-// NexExecutionProviderV8 V8 execution provider
+// V8 execution provider
 const NexExecutionProviderV8 = "v8"
 
-// NexExecutionProviderOCI OCI execution provider
+// OCI execution provider
 const NexExecutionProviderOCI = "oci"
 
-// NexExecutionProviderWasm Wasm execution provider
+// Wasm execution provider
 const NexExecutionProviderWasm = "wasm"
 
-// WorkloadCacheBucket is an internal, non-public bucket for sharing files between host and agent
+// Name of the internal, non-public bucket for sharing files between host and agent
 const WorkloadCacheBucket = "NEXCACHE"
 
 // DefaultRunloopSleepTimeoutMillis default number of milliseconds to sleep during execution runloops

nex-agent/agent.go

@@ -15,7 +15,7 @@ import (
 	"github.com/nats-io/nats.go"
 )
 
-const NexAgentSubjectAdvertise = "agentint.handshake"
+const defaultAgentHandshakeTimeoutMillis = 250
 const workloadExecutionSleepTimeoutMillis = 1000
 
 // Agent facilitates communication between the nex agent running in the firecracker VM
@@ -75,7 +75,7 @@ func NewAgent() (*Agent, error) {
 // Start the agent
 // NOTE: agent process will request vm shutdown if this fails
 func (a *Agent) Start() error {
-	err := a.Advertise()
+	err := a.RequestHandshake()
 	if err != nil {
 		a.LogError(fmt.Sprintf("Failed to handshake with node: %s", err))
 		return err
@@ -95,17 +95,17 @@ func (a *Agent) Start() error {
 	return nil
 }
 
-// Publish an initial message to the host indicating the agent is "all the way" up
+// Request a handshake with the host indicating the agent is "all the way" up
 // NOTE: the agent process will request a VM shutdown if this fails
-func (a *Agent) Advertise() error {
+func (a *Agent) RequestHandshake() error {
 	msg := agentapi.HandshakeRequest{
 		MachineId: a.md.VmId,
 		StartTime: a.started,
 		Message:   a.md.Message,
 	}
 	raw, _ := json.Marshal(msg)
 
-	_, err := a.nc.Request(NexAgentSubjectAdvertise, raw, 100*time.Millisecond)
+	_, err := a.nc.Request(agentapi.NexAgentSubjectHandshake, raw, time.Millisecond*defaultAgentHandshakeTimeoutMillis)
 	if err != nil {
 		a.LogError(fmt.Sprintf("Agent failed to request initial sync message: %s", err))
 		return err