fix : panic when second sidcar registe

polarismesh · Nov 30, 2023 · 2be94f1 · 2be94f1
1 parent 5f207e2
commit 2be94f1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/apiserver/xdsserverv3/cache/cache.go b/apiserver/xdsserverv3/cache/cache.go
@@ -86,7 +86,7 @@ func (sc *XDSCache) CreateDeltaWatch(request *cachev3.DeltaRequest, state stream
 	}
 	item := sc.loadCache(request)
 	if item == nil {
-		value <- nil
+		value <- &NoReadyXdsResponse{}
 		return func() {}
 	}
 	return item.CreateDeltaWatch(request, state, value)

diff --git a/apiserver/xdsserverv3/cache/response.go b/apiserver/xdsserverv3/cache/response.go
@@ -0,0 +1,20 @@
+package cache
+
+import (
+	"errors"
+
+	discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
+	cachev3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
+)
+
+type NoReadyXdsResponse struct{
+	cachev3.DeltaResponse
+}
+
+func (r *NoReadyXdsResponse) GetDeltaRequest() *discovery.DeltaDiscoveryRequest{
+	return nil
+}
+
+func (r *NoReadyXdsResponse) GetDeltaDiscoveryResponse() (*discovery.DeltaDiscoveryResponse, error){
+	return nil, errors.New("node xds not created yet")
+}