public_git
/
orchard
mirror of https://github.com/cirruslabs/orchard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Worker notification improvements (#246) 

* OpenAPI: document all default "wait" values

* Re-use waitContext instead of instantiating it anew
This commit is contained in:
Nikolay Edigaryev 2025-02-07 00:38:04 +04:00 committed by GitHub
parent 722d5a8eaf
commit 8dd74db446
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/openapi.yaml
View File

@ -354,6 +354,7 @@ paths:
type: integer
minimum: 0
maximum: 65535
default: 10
required: false
- in: header
name: Connection
@ -393,6 +394,7 @@ paths:
type: integer
minimum: 0
maximum: 65535
default: 0
required: false
responses:
'200':

3
internal/controller/api_vms_ip.go
View File

@ -26,8 +26,7 @@ func (controller *Controller) ip(ctx *gin.Context) responder.Responder {
if err != nil {
return responder.Code(http.StatusBadRequest)
}
waitDuration := time.Duration(wait) * time.Second
waitContext, waitContextCancel := context.WithTimeout(ctx, waitDuration)
waitContext, waitContextCancel := context.WithTimeout(ctx, time.Duration(wait)*time.Second)
defer waitContextCancel()
// Look-up the VM

11
internal/controller/api_vms_portforward.go
View File

@ -42,8 +42,7 @@ func (controller *Controller) portForwardVM(ctx *gin.Context) responder.Responde
if err != nil {
return responder.Code(http.StatusBadRequest)
}
waitDuration := time.Duration(wait) * time.Second
waitContext, waitContextCancel := context.WithTimeout(ctx, waitDuration)
waitContext, waitContextCancel := context.WithTimeout(ctx, time.Duration(wait)*time.Second)
defer waitContextCancel()
// Look-up the VM
@ -53,15 +52,15 @@ func (controller *Controller) portForwardVM(ctx *gin.Context) responder.Responde
}
// Commence port-forwarding
return controller.portForward(ctx, vm.Worker, vm.UID, uint32(port), waitDuration)
return controller.portForward(ctx, waitContext, vm.Worker, vm.UID, uint32(port))
}
func (controller *Controller) portForward(
ctx *gin.Context,
notifyContext context.Context,
workerName string,
vmUID string,
port uint32,
waitTimeout time.Duration,
) responder.Responder {
// Request and wait for a connection with a worker
rendezvousCtx, rendezvousCtxCancel := context.WithCancel(ctx)
@ -73,9 +72,7 @@ func (controller *Controller) portForward(
defer cancel()
// send request to worker to initiate port-forwarding connection back to us
waitContext, waitContextCancel := context.WithTimeout(ctx, waitTimeout)
defer waitContextCancel()
err := controller.workerNotifier.Notify(waitContext, workerName, &rpc.WatchInstruction{
err := controller.workerNotifier.Notify(notifyContext, workerName, &rpc.WatchInstruction{
Action: &rpc.WatchInstruction_PortForwardAction{
PortForwardAction: &rpc.WatchInstruction_PortForward{
Session: session,

6
internal/controller/api_workers_portforward.go
View File

@ -1,6 +1,7 @@
package controller
import (
"context"
storepkg "github.com/cirruslabs/orchard/internal/controller/store"
"github.com/cirruslabs/orchard/internal/responder"
v1 "github.com/cirruslabs/orchard/pkg/resource/v1"
@ -32,7 +33,8 @@ func (controller *Controller) portForwardWorker(ctx *gin.Context) responder.Resp
if err != nil {
return responder.Code(http.StatusBadRequest)
}
waitDuration := time.Duration(wait) * time.Second
waitContext, waitContextCancel := context.WithTimeout(ctx, time.Duration(wait)*time.Second)
defer waitContextCancel()
var worker *v1.Worker
@ -48,5 +50,5 @@ func (controller *Controller) portForwardWorker(ctx *gin.Context) responder.Resp
}
// Commence port-forwarding
return controller.portForward(ctx, worker.Name, "", uint32(port), waitDuration)
return controller.portForward(ctx, waitContext, worker.Name, "", uint32(port))
}