Merge pull request loxilb-io#548 from TrekkieCoder/main

loxilb-iogh-546: probetimeo/retry count configuration on LB creation
nik-netlox · Feb 23, 2024 · 2a4f61c · 2a4f61c
2 parents 7a3102d + f5e9975
commit 2a4f61c
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 7 deletions.
diff --git a/api/models/loadbalance_entry.go b/api/models/loadbalance_entry.go
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
@@ -42,6 +42,8 @@ func ConfigPostLoadbalancer(params operations.PostConfigLoadbalancerParams) midd
 	lbRules.Serv.ProbePort = params.Attr.ServiceArguments.Probeport
 	lbRules.Serv.ProbeReq = params.Attr.ServiceArguments.Probereq
 	lbRules.Serv.ProbeResp = params.Attr.ServiceArguments.Proberesp
+	lbRules.Serv.ProbeTimeout = params.Attr.ServiceArguments.ProbeTimeout
+	lbRules.Serv.ProbeRetries = int(params.Attr.ServiceArguments.ProbeRetries)
 	lbRules.Serv.Name = params.Attr.ServiceArguments.Name
 
 	if lbRules.Serv.Proto == "sctp" {

diff --git a/api/swagger.yml b/api/swagger.yml
@@ -2445,6 +2445,14 @@ definitions:
             type: integer
             format: int32
             description: value for inactivity timeout (in seconds)
+          probeTimeout:
+            type: integer
+            format: uint32
+            description: value for probe timer (in seconds)
+          probeRetries:
+            type: integer
+            format: int32
+            description: value for probe retries
           name:
             type: string
             description: service name

diff --git a/common/common.go b/common/common.go
@@ -517,6 +517,10 @@ type LbServiceArg struct {
 	ProbeReq string `json:"probereq"`
 	// ProbeResp - Response string for liveness check
 	ProbeResp string `json:"proberesp"`
+	// ProbeTimeout - Probe Timeout
+	ProbeTimeout uint32 `json:"probeTimeout"`
+	// ProbeRetries - Probe Retries
+	ProbeRetries int `json:"probeRetries"`
 	// Name - Service name
 	Name string `json:"name"`
 }

diff --git a/loxinet/rules.go b/loxinet/rules.go
@@ -253,11 +253,13 @@ type ruleStat struct {
 }
 
 type ruleProbe struct {
-	actChk  bool
-	prbType string
-	prbPort uint16
-	prbReq  string
-	prbResp string
+	actChk     bool
+	prbType    string
+	prbPort    uint16
+	prbReq     string
+	prbResp    string
+	prbTimeo   uint32
+	prbRetries int
 }
 
 type ruleEnt struct {
@@ -820,8 +822,16 @@ func (R *RuleH) modNatEpHost(r *ruleEnt, endpoints []ruleNatEp, doAddOp bool, li
 	var hopts epHostOpts
 	pType := ""
 	pPort := uint16(0)
-	hopts.inActTryThr = DflLbaInactiveTries
-	hopts.probeDuration = DflHostProbeTimeout
+	if r.hChk.prbRetries == 0 {
+		hopts.inActTryThr = DflLbaInactiveTries
+	} else {
+		hopts.inActTryThr = r.hChk.prbRetries
+	}
+	if r.hChk.prbTimeo == 0 {
+		hopts.probeDuration = DflHostProbeTimeout
+	} else {
+		hopts.probeDuration = r.hChk.prbTimeo
+	}
 	for _, nep := range endpoints {
 		if r.tuples.l4Prot.val == 6 {
 			pType = HostProbeConnectTCP
@@ -1373,6 +1383,8 @@ func (R *RuleH) AddNatLbRule(serv cmn.LbServiceArg, servSecIPs []cmn.LbSecIPArg,
 		eRule.hChk.prbPort = serv.ProbePort
 		eRule.hChk.prbReq = serv.ProbeReq
 		eRule.hChk.prbResp = serv.ProbeResp
+		eRule.hChk.prbRetries = serv.ProbeRetries
+		eRule.hChk.prbTimeo = serv.ProbeTimeout
 		eRule.act.action.(*ruleNatActs).sel = natActs.sel
 		eRule.act.action.(*ruleNatActs).endPoints = eEps
 		eRule.act.action.(*ruleNatActs).mode = natActs.mode
@@ -1408,6 +1420,8 @@ func (R *RuleH) AddNatLbRule(serv cmn.LbServiceArg, servSecIPs []cmn.LbSecIPArg,
 	r.hChk.prbPort = serv.ProbePort
 	r.hChk.prbReq = serv.ProbeReq
 	r.hChk.prbResp = serv.ProbeResp
+	r.hChk.prbRetries = serv.ProbeRetries
+	r.hChk.prbTimeo = serv.ProbeTimeout
 	r.hChk.actChk = serv.Monitor
 	r.act.action = &natActs
 	r.ruleNum, err = R.tables[RtLB].Mark.GetCounter()