Merge pull request #351 from TrekkieCoder/main

PR - Liveness check type on a per-rule basis (#350)
loxilb-io · Jul 11, 2023 · ad867e7 · ad867e7
2 parents dad68cb + b23b5e7
commit ad867e7
Show file tree

Hide file tree

Showing 10 changed files with 207 additions and 48 deletions.
diff --git a/api/api.go b/api/api.go
@@ -32,7 +32,8 @@ import (
 )
 
 var (
- ApiReady bool
+ ApiReady bool
+ ApiShutOk chan bool
 )
 
 // RegisterAPIHooks - routine to register interface for api
@@ -51,6 +52,20 @@ func WaitAPIServerReady() {
  }
 }
 
+func waitApiServerShutOk() {
+ for {
+ select {
+ case <-ApiShutOk:
+ return
+ }
+ }
+}
+
+// ApiServerShutOk - Notifier for server to be shutdown on signals
+func ApiServerShutOk() {
+ ApiShutOk <- true
+}
+
 // This file was generated by the swagger tool.
 // Make sure not to overwrite this file after you generated it because all your edits would be lost!
 
@@ -64,6 +79,10 @@ func RunAPIServer() {
  }
  }()
 
+ if ApiShutOk == nil {
+ ApiShutOk = make(chan bool)
+ }
+
  swaggerSpec, err := loads.Embedded(restapi.SwaggerJSON, restapi.FlatSwaggerJSON)
  if err != nil {
  log.Fatalln(err)
@@ -101,6 +120,10 @@ func RunAPIServer() {
  server.TLSCertificate = options.Opts.TLSCertificate
  server.Port = options.Opts.Port
  server.TLSPort = options.Opts.TLSPort
+ api.ServerShutdown = func() {
+ waitApiServerShutOk()
+ os.Exit(0)
+ }
  ApiReady = true
 
  if err := server.Serve(); err != nil {

diff --git a/api/models/loadbalance_entry.go b/api/models/loadbalance_entry.go
diff --git a/api/restapi/configure_loxilb_rest_api.go b/api/restapi/configure_loxilb_rest_api.go
@@ -18,7 +18,6 @@ package restapi
 import (
  "crypto/tls"
  "net/http"
- "os"
 
  opts "github.com/loxilb-io/loxilb/options"
 
@@ -155,9 +154,7 @@ func configureAPI(api *operations.LoxilbRestAPIAPI) http.Handler {
 
  api.PreServerShutdown = func() {}
 
- api.ServerShutdown = func() {
- os.Exit(0)
- }
+ api.ServerShutdown = func() {}
 
  return setupGlobalMiddleware(api.Serve(setupMiddlewares))
 }

diff --git a/api/restapi/embedded_spec.go b/api/restapi/embedded_spec.go
diff --git a/api/restapi/handler/loadbalancer.go b/api/restapi/handler/loadbalancer.go
@@ -38,6 +38,10 @@ func ConfigPostLoadbalancer(params operations.PostConfigLoadbalancerParams) midd
  lbRules.Serv.Mode = cmn.LBMode(params.Attr.ServiceArguments.Mode)
  lbRules.Serv.InactiveTimeout = uint32(params.Attr.ServiceArguments.InactiveTimeOut)
  lbRules.Serv.Managed = params.Attr.ServiceArguments.Managed
+ lbRules.Serv.ProbeType = params.Attr.ServiceArguments.Probetype
+ lbRules.Serv.ProbePort = params.Attr.ServiceArguments.Probeport
+ lbRules.Serv.ProbeReq = params.Attr.ServiceArguments.Probereq
+ lbRules.Serv.ProbeResp = params.Attr.ServiceArguments.Proberesp
 
  if lbRules.Serv.Proto == "sctp" {
  for _, data := range params.Attr.SecondaryIPs {
@@ -119,6 +123,8 @@ func ConfigGetLoadbalancer(params operations.GetConfigLoadbalancerAllParams) mid
  tmpSvc.InactiveTimeOut = int32(lb.Serv.InactiveTimeout)
  tmpSvc.Monitor = lb.Serv.Monitor
  tmpSvc.Managed = lb.Serv.Managed
+ tmpSvc.Probetype = lb.Serv.ProbeType
+ tmpSvc.Probeport = lb.Serv.ProbePort
 
  tmpLB.ServiceArguments = &tmpSvc
 

diff --git a/api/restapi/server.go b/api/restapi/server.go
diff --git a/api/swagger.yml b/api/swagger.yml
@@ -2166,6 +2166,19 @@ definitions:
  monitor:
  type: boolean
  description: value for monitoring enabled or not
+ probetype:
+ type: string
+ description: probe type for any end-point of this entry
+ probeport:
+ type: integer
+ format: uint16
+ description: probe port if probetype is tcp/udp/sctp
+ probereq:
+ type: string
+ description: probe request string
+ proberesp:
+ type: string
+ description: probe response string
  managed:
  type: boolean
  description: externally managed rule or not

diff --git a/common/common.go b/common/common.go
@@ -500,6 +500,14 @@ type LbServiceArg struct {
  InactiveTimeout uint32 `json:"inactiveTimeout"`
  // Managed - This rule is managed by external entity e.g k8s
  Managed bool `json:"managed"`
+ // ProbeType - Liveness check type for this rule : ping, tcp, udp, sctp, none, http(s)
+ ProbeType string `json:"probetype"`
+ // ProbePort - Liveness check port number. Only valid for tcp, udp, sctp, http(s)
+ ProbePort uint16 `json:"probeport"`
+ // ProbeReq - Request string for liveness check
+ ProbeReq string `json:"probereq"`
+ // ProbeResp - Response string for liveness check
+ ProbeResp string `json:"proberesp"`
 }
 
 // LbEndPointArg - Information related to load-balancer end-point

diff --git a/loxinet/loxinet.go b/loxinet/loxinet.go
@@ -22,7 +22,6 @@ import (
  apiserver "github.com/loxilb-io/loxilb/api"
  nlp "github.com/loxilb-io/loxilb/api/loxinlp"
  prometheus "github.com/loxilb-io/loxilb/api/prometheus"
- restapi "github.com/loxilb-io/loxilb/api/restapi"
  cmn "github.com/loxilb-io/loxilb/common"
  opts "github.com/loxilb-io/loxilb/options"
  tk "github.com/loxilb-io/loxilib"
@@ -185,7 +184,7 @@ func loxiNetTicker() {
  } else if sig == syscall.SIGINT || sig == syscall.SIGTERM {
  tk.LogIt(tk.LogCritical, "Shutdown on sig %v\n", sig)
  mh.dpEbpf.DpEbpfUnInit()
- restapi.ServerSigShutOk()
+ apiserver.ApiServerShutOk()
  }
  case t := <-mh.ticker.C:
  tk.LogIt(-1, "Tick at %v\n", t)