From dc6217ffc0f7207c5335ccc841b21ca0f9e4e926 Mon Sep 17 00:00:00 2001 From: owenwang2020 <65215158+owenwang2020@users.noreply.github.com> Date: Tue, 16 Jul 2024 17:49:20 +0800 Subject: [PATCH 1/5] Update http_util.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 利用通义灵码分析代码存在的问题，同时自动给出优化建议。（边界条件处理、异常处理） --- plugins/wasm-cpp/common/http_util.cc | 78 ++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 21 deletions(-) diff --git a/plugins/wasm-cpp/common/http_util.cc b/plugins/wasm-cpp/common/http_util.cc index 320ed916c5..7d3c77aede 100644 --- a/plugins/wasm-cpp/common/http_util.cc +++ b/plugins/wasm-cpp/common/http_util.cc @@ -158,32 +158,68 @@ inline std::string subspan(absl::string_view source, size_t start, size_t end) { return {source.data() + start, end - start}; } -QueryParams parseParameters(absl::string_view data, size_t start, - bool decode_params) { - QueryParams params; +class QueryParams { +public: + using ParamMap = std::unordered_map; + ParamMap params; - while (start < data.size()) { - size_t end = data.find('&', start); - if (end == std::string::npos) { - end = data.size(); + void emplace(const std::string& name, const std::string& value) { + params.emplace(name, value); } - absl::string_view param(data.data() + start, end - start); - - const size_t equal = param.find('='); - if (equal != std::string::npos) { - const auto param_name = subspan(data, start, start + equal); - const auto param_value = subspan(data, start + equal + 1, end); - params.emplace( - decode_params ? PercentEncoding::decode(param_name) : param_name, - decode_params ? PercentEncoding::decode(param_value) : param_value); - } else { - params.emplace(subspan(data, start, end), ""); +}; + +QueryParams parseParameters(absl::string_view data, size_t start, + bool decode_params) { + if (start > data.size()) { + throw std::out_of_range("Start index is out of range."); } - start = end + 1; - } + QueryParams params; - return params; + while (start < data.size()) { + size_t end = data.find('&', start); + if (end == std::string::npos) { + end = data.size(); + } + + absl::string_view param(data.data() + start, end - start); + + const size_t equal = param.find('='); + if (equal != std::string::npos) { + auto param_name = subspan(data, start, start + equal); + auto param_value = subspan(data, start + equal + 1, end); + + try { + if (decode_params) { + param_name = PercentEncoding::decode(param_name); + param_value = PercentEncoding::decode(param_value); + } + } catch (const std::exception& e) { + // Handle decoding exceptions if necessary, or rethrow. + throw; + } + + params.emplace(param_name, param_value); + } else { + // Handle parameters without '=' (i.e., no value). + // Optionally decode according to `decode_params`. + try { + if (decode_params) { + auto decoded_param = PercentEncoding::decode(param); + params.emplace(decoded_param, ""); + } else { + params.emplace(param, ""); + } + } catch (const std::exception& e) { + // Handle decoding exceptions if necessary, or rethrow. + throw; + } + } + + start = end + 1; + } + + return params; } std::vector getAllOfHeader(std::string_view key) { From 9ab24cedee69121480122adb4df445a71c3518ce Mon Sep 17 00:00:00 2001 From: owenwang2020 <65215158+owenwang2020@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:37:49 +0800 Subject: [PATCH 2/5] Update metrics.go --- pkg/ingress/kube/common/metrics.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/ingress/kube/common/metrics.go b/pkg/ingress/kube/common/metrics.go index a8795796d6..757dc0fe01 100644 --- a/pkg/ingress/kube/common/metrics.go +++ b/pkg/ingress/kube/common/metrics.go @@ -52,11 +52,16 @@ var ( "Total invalid ingresses known to pilot.", monitoring.WithLabels(clusterTag, invalidType), ) + + queryK8sVersionFail = monitoring.NewSum( + "pilot_query_k8s_version_fail", + "query k8s version of remote cluster fail number") ) func init() { monitoring.MustRegister(totalIngresses) monitoring.MustRegister(totalInvalidIngress) + monitoring.MustRegister(queryK8sVersionFail) } func RecordIngressNumber(cluster string, number int) { From 21d9966013df2eb7bfd8a0d90b9a6469a97ef00e Mon Sep 17 00:00:00 2001 From: owenwang2020 <65215158+owenwang2020@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:39:35 +0800 Subject: [PATCH 3/5] Update tool.go --- pkg/ingress/kube/common/tool.go | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkg/ingress/kube/common/tool.go b/pkg/ingress/kube/common/tool.go index 9f39665e18..42d33599a8 100644 --- a/pkg/ingress/kube/common/tool.go +++ b/pkg/ingress/kube/common/tool.go @@ -17,9 +17,11 @@ package common import ( "crypto/md5" "encoding/hex" + "k8s.io/apimachinery/pkg/util/wait" "net" "sort" "strings" + "time" networking "istio.io/api/networking/v1alpha3" "istio.io/istio/pilot/pkg/model" @@ -32,6 +34,30 @@ import ( . "github.com/alibaba/higress/pkg/ingress/log" ) +const ( + defaultInterval = 3 * time.Second + defaultTimeout = 1 * time.Minute +) + +type retry struct { + interval time.Duration + timeout time.Duration +} + +type RetryOption func(o *retry) + +func WithInterval(interval time.Duration) RetryOption { + return func(r *retry) { + r.interval = interval + } +} + +func WithTimeout(timeout time.Duration) RetryOption { + return func(r *retry) { + r.timeout = timeout + } +} + func ValidateBackendResource(resource *v1.TypedLocalObjectReference) bool { if resource == nil || resource.APIGroup == nil || *resource.APIGroup != netv1.SchemeGroupVersion.Group || From 1a87371cccd197f94dbf11b47eb9a6f21de53f16 Mon Sep 17 00:00:00 2001 From: owenwang2020 <65215158+owenwang2020@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:50:03 +0800 Subject: [PATCH 4/5] Update tool.go --- pkg/ingress/kube/common/tool.go | 95 +++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/pkg/ingress/kube/common/tool.go b/pkg/ingress/kube/common/tool.go index 42d33599a8..d935f12da8 100644 --- a/pkg/ingress/kube/common/tool.go +++ b/pkg/ingress/kube/common/tool.go @@ -88,6 +88,62 @@ func V1Available(client kube.Client) bool { return runningVersion.AtLeast(version119) } +func V1Available(client kube.Client, retryOptions ...RetryOption) bool { + retry := &retry{ + interval: defaultInterval, + timeout: defaultTimeout, + } + + for _, option := range retryOptions { + option(retry) + } + + // most case is greater than 1.18 + supportV1 := true + err := wait.PollImmediate(retry.interval, retry.timeout, func() (done bool, err error) { + available, err := v1Available(client) + if err != nil { + IngressLog.Errorf("check v1 available error: %v", err) + // retry + return false, nil + } + supportV1 = available + // we have done. + return true, nil + }) + + if err != nil { + IngressLog.Errorf("check v1 available finally error: %v", err) + } + + return supportV1 +} + +func IsRunningVersionAtLeast(atLeastVersionStr string, client kube.Client) (bool, error) { + atLeastVersion, _ := version.ParseGeneric(atLeastVersionStr) + + serverVersion, err := client.GetKubernetesVersion() + if err != nil { + // Consider the new ingress package is available as default + return true + queryK8sVersionFail.Increment() + return false, err + } + + runningVersion, err := version.ParseGeneric(serverVersion.String()) + if err != nil { + // Consider the new ingress package is available as default + IngressLog.Errorf("unexpected error parsing running Kubernetes version: %v", err) + return true + queryK8sVersionFail.Increment() + return false, err + } + + return runningVersion.AtLeast(version119) + return runningVersion.AtLeast(atLeastVersion), nil +} + + // NetworkingIngressAvailable check if the "networking" group Ingress is available. func NetworkingIngressAvailable(client kube.Client) bool { // check kubernetes version to use new ingress package or not @@ -107,6 +163,45 @@ func NetworkingIngressAvailable(client kube.Client) bool { return runningVersion.AtLeast(version118) } +func NetworkingIngressAvailable(client kube.Client, retryOptions ...RetryOption) bool { + retry := &retry{ + interval: defaultInterval, + timeout: defaultTimeout, + } + + serverVersion, err := client.GetKubernetesVersion() + if err != nil { + return false + for _, option := range retryOptions { + option(retry) + } + + runningVersion, err := version.ParseGeneric(serverVersion.String()) + // most case is greater than or equal 1.18. + supportNetworking := true + + err := wait.PollImmediate(retry.interval, retry.timeout, func() (done bool, err error) { + available, err := networkingIngressAvailable(client) + if err != nil { + IngressLog.Errorf("check networking available error: %v", err) + // retry + return false, nil + } + supportNetworking = available + // we have done. + return true, nil + }) + + if err != nil { + IngressLog.Errorf("unexpected error parsing running Kubernetes version: %v", err) + return false + IngressLog.Errorf("check networking available finally error: %v", err) + } + + return runningVersion.AtLeast(version118) + return supportNetworking +} + // SortIngressByCreationTime sorts the list of config objects in ascending order by their creation time (if available). func SortIngressByCreationTime(configs []config.Config) { sort.Slice(configs, func(i, j int) bool { From 0cb0b8d979cc7da3b56963c75c0c95fc0b9606bb Mon Sep 17 00:00:00 2001 From: owenwang2020 <65215158+owenwang2020@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:51:14 +0800 Subject: [PATCH 5/5] Update tool_test.go --- pkg/ingress/kube/common/tool_test.go | 104 +++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/pkg/ingress/kube/common/tool_test.go b/pkg/ingress/kube/common/tool_test.go index d2f92009e9..6a6a08da0e 100644 --- a/pkg/ingress/kube/common/tool_test.go +++ b/pkg/ingress/kube/common/tool_test.go @@ -556,3 +556,107 @@ func TestSortHTTPRoutesWithMoreRules(t *testing.T) { } } } + +type supportV1Client struct { + kube.Client +} + +func (s *supportV1Client) GetKubernetesVersion() (*kubeVersion.Info, error) { + return &kubeVersion.Info{ + GitVersion: "v1.28.3-aliyun.1", + }, nil +} + +type unSupportV1Client struct { + kube.Client +} + +func (u *unSupportV1Client) GetKubernetesVersion() (*kubeVersion.Info, error) { + return &kubeVersion.Info{ + GitVersion: "v1.18.0", + }, nil +} + +type supportNetworkingClient struct { + kube.Client +} + +func (s *supportNetworkingClient) GetKubernetesVersion() (*kubeVersion.Info, error) { + return &kubeVersion.Info{ + GitVersion: "v1.18.0-aliyun.1", + }, nil +} + +type unSupportNetworkingClient struct { + kube.Client +} + +func (u *unSupportNetworkingClient) GetKubernetesVersion() (*kubeVersion.Info, error) { + return &kubeVersion.Info{ + GitVersion: "v1.17.0-aliyun.1", + }, nil +} + +type errorClient struct { + kube.Client +} + +func (e *errorClient) GetKubernetesVersion() (*kubeVersion.Info, error) { + return &kubeVersion.Info{ + GitVersion: "error", + }, nil +} + +func TestV1Available(t *testing.T) { + fakeClient := kube.NewFakeClient() + + v1Client := &supportV1Client{ + fakeClient, + } + + if !V1Available(v1Client) { + t.Fatal("should support v1") + } + + v1Beta1Client := &unSupportV1Client{ + fakeClient, + } + if V1Available(v1Beta1Client) { + t.Fatal("should not support v1") + } + + errorClient := &errorClient{ + fakeClient, + } + // will fallback to v1 + if !V1Available(errorClient, WithInterval(1*time.Second), WithTimeout(3*time.Second)) { + t.Fatal("should fallback to v1") + } +} + +func TestNetworkingIngressAvailable(t *testing.T) { + fakeClient := kube.NewFakeClient() + + networkingClient := &supportNetworkingClient{ + fakeClient, + } + + if !NetworkingIngressAvailable(networkingClient) { + t.Fatal("should support networking") + } + + notNetworkingClient := &unSupportNetworkingClient{ + fakeClient, + } + if NetworkingIngressAvailable(notNetworkingClient) { + t.Fatal("should not support networking") + } + + errorClient := &errorClient{ + fakeClient, + } + // will fallback to networking + if !NetworkingIngressAvailable(errorClient, WithInterval(1*time.Second), WithTimeout(3*time.Second)) { + t.Fatal("should fallback to networking") + } +}