Merge pull request #597 from TrekkieCoder/main

fixes: conntrack aging related
loxilb-io · Mar 21, 2024 · e6f2a80 · e6f2a80
2 parents 4fed199 + 796d5e2
commit e6f2a80
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/loxilb-ebpf b/loxilb-ebpf
diff --git a/loxinet/rules.go b/loxinet/rules.go
@@ -78,18 +78,19 @@ const (
 
 // constants
 const (
-	MaxNatEndPoints          = 16
-	DflLbaInactiveTries      = 2         // Default number of inactive tries before LB arm is turned off
-	MaxDflLbaInactiveTries   = 100       // Max number of inactive tries before LB arm is turned off
-	DflLbaCheckTimeout       = 10        // Default timeout for checking LB arms
-	DflHostProbeTimeout      = 60        // Default probe timeout for end-point host
-	InitHostProbeTimeout     = 15        // Initial probe timeout for end-point host
-	MaxHostProbeTime         = 24 * 3600 // Max possible host health check duration
-	LbDefaultInactiveTimeout = 4 * 60    // Default inactive timeout for established sessions
-	LbMaxInactiveTimeout     = 24 * 3600 // Maximum inactive timeout for established sessions
-	MaxEndPointCheckers      = 4         // Maximum helpers to check endpoint health
-	EndPointCheckerDuration  = 2         // Duration at which ep-helpers will run
-	MaxEndPointSweeps        = 20        // Maximum end-point sweeps per round
+	MaxNatEndPoints            = 16
+	DflLbaInactiveTries        = 2         // Default number of inactive tries before LB arm is turned off
+	MaxDflLbaInactiveTries     = 100       // Max number of inactive tries before LB arm is turned off
+	DflLbaCheckTimeout         = 10        // Default timeout for checking LB arms
+	DflHostProbeTimeout        = 60        // Default probe timeout for end-point host
+	InitHostProbeTimeout       = 15        // Initial probe timeout for end-point host
+	MaxHostProbeTime           = 24 * 3600 // Max possible host health check duration
+	LbDefaultInactiveTimeout   = 4 * 60    // Default inactive timeout for established sessions
+	LbDefaultInactiveNSTimeout = 20        // Default inactive timeout for non-session oriented protocols
+	LbMaxInactiveTimeout       = 24 * 3600 // Maximum inactive timeout for established sessions
+	MaxEndPointCheckers        = 4         // Maximum helpers to check endpoint health
+	EndPointCheckerDuration    = 2         // Duration at which ep-helpers will run
+	MaxEndPointSweeps          = 20        // Maximum end-point sweeps per round
 )
 
 type ruleTType uint
@@ -1206,6 +1207,9 @@ func (R *RuleH) AddNatLbRule(serv cmn.LbServiceArg, servSecIPs []cmn.LbSecIPArg,
 		return RuleArgsErr, errors.New("service-args error")
 	} else if serv.InactiveTimeout == 0 {
 		serv.InactiveTimeout = LbDefaultInactiveTimeout
+		if serv.Proto != "tcp" && serv.Proto != "sctp" {
+			serv.InactiveTimeout = LbDefaultInactiveNSTimeout
+		}
 	}
 
 	// Validate liveness probetype and port