Merge pull request kmesh-net#1003 from bfforever/lb_ospp_bugfix

kmesh-bot · web-flow · commit ed6956e96d99 · 2024-11-06T11:00:41.000+08:00
fix lb_ospp bug and add ref
diff --git a/pkg/consistenthash/maglev/maglev.go b/pkg/consistenthash/maglev/maglev.go
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+// NOTE: THE CODE IN THIS FILE IS MAINLY REFERENCED FROM CILIUM MAGLEV
+// ALGORITHM( https://github.com/cilium/cilium/blob/44ec948479bb7e4511ec39f1e0d19d794ca1fba3/pkg/maglev/maglev.go)
+// AND ADAPTED FOR KMESH.
+
 package maglev
 
 import (
diff --git a/pkg/controller/ads/cache.go b/pkg/controller/ads/cache.go
@@ -490,7 +490,7 @@ func newApiRouteAction(action *config_route_v3.RouteAction) *route_v2.RouteActio
 			apiHashPolicys = append(apiHashPolicys, apiHashPolicy)
 		default:
 			log.Errorf("newApiRouteAction HashPolicy default, type is %T", hp.GetPolicySpecifier())
-			return nil
+			continue
 		}
 	}
 	apiAction.HashPolicy = apiHashPolicys

Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ func newApiRouteAction(action config_route_v3.RouteAction) route_v2.RouteActio`
`490`	`490`	`apiHashPolicys = append(apiHashPolicys, apiHashPolicy)`
`491`	`491`	`default:`
`492`	`492`	`log.Errorf("newApiRouteAction HashPolicy default, type is %T", hp.GetPolicySpecifier())`
`493`		`- return nil`
	`493`	`+ continue`
`494`	`494`	`}`
`495`	`495`	`}`
`496`	`496`	`apiAction.HashPolicy = apiHashPolicys`