MESH-0000: Add Len() method to caches and log cache lengths in controllers

Author: pchaand

admiral/pkg/clusters/virtualservice_routing.go

@@ -1208,6 +1208,9 @@ func mergeCustomVirtualServices(
 	if rc.VirtualServiceController.VirtualServiceCache == nil {
 		return nil, fmt.Errorf("virtualServiceController.VirtualServiceCache is nil")
 	}
+	if rc.VirtualServiceController.HostToRouteDestinationCache == nil {
+		return nil, fmt.Errorf("virtualServiceController.HostToRouteDestinationCache is nil")
+	}
 
 	mergedVirtualServices := make([]*v1alpha3.VirtualService, 0)
 
@@ -1227,6 +1230,7 @@ func mergeCustomVirtualServices(
 				return nil, err
 			}
 			err = rc.VirtualServiceController.HostToRouteDestinationCache.Put(mergedVirtualService)
+			log.Infof("HostToRouteDestinationCache length: %d", rc.VirtualServiceController.HostToRouteDestinationCache.Len())
 			if err != nil {
 				return nil, err
 			}

admiral/pkg/controller/admiral/rollouts.go

@@ -51,6 +51,7 @@ type IIdentityArgoVSCache interface {
 	Get(identity string) map[string]bool
 	Put(newRolloutObj *argo.Rollout, oldRolloutObj *argo.Rollout) error
 	Delete(rolloutObj *argo.Rollout) error
+	Len() int
 }
 
 type IdentityArgoVSCache struct {
@@ -494,14 +495,18 @@ func (r *RolloutController) populateIdentityArgoVSCache(
 		return fmt.Errorf("type assertion failed, %v is not of type *argo.Rollout", obj)
 	}
 	if oldObj == nil {
-		return r.IdentityArgoVSCache.Put(rollout, nil)
+		err := r.IdentityArgoVSCache.Put(rollout, nil)
+		log.Infof("IdentityArgoVSCache length: %d", r.IdentityArgoVSCache.Len())
+		return err
 	}
 	oldRollout, oldOk := oldObj.(*argo.Rollout)
 	if !oldOk {
 		return fmt.Errorf("type assertion failed, %v is not of type *argo.Rollout", oldObj)
 	}
 
-	return r.IdentityArgoVSCache.Put(rollout, oldRollout)
+	err := r.IdentityArgoVSCache.Put(rollout, oldRollout)
+	log.Infof("IdentityArgoVSCache length: %d", r.IdentityArgoVSCache.Len())
+	return err
 }
 
 func getArgoVSFromRollout(rollout *argo.Rollout) string {
@@ -566,3 +571,9 @@ func (i *IdentityArgoVSCache) Delete(rolloutObj *argo.Rollout) error {
 	}
 	return nil
 }
+
+func (i *IdentityArgoVSCache) Len() int {
+	defer i.mutex.RUnlock()
+	i.mutex.RLock()
+	return len(i.cache)
+}

admiral/pkg/controller/istio/virtualservice.go

@@ -35,6 +35,7 @@ type IVirtualServiceCache interface {
 	Delete(vs *networking.VirtualService)
 	GetVSProcessStatus(vs *networking.VirtualService) string
 	UpdateVSProcessStatus(vs *networking.VirtualService, status string) error
+	Len() int
 }
 
 type VirtualServiceController struct {
@@ -81,6 +82,7 @@ type IIdentityVirtualServiceCache interface {
 	Get(identity string) map[string]*networking.VirtualService
 	Put(vs *networking.VirtualService) error
 	Delete(vs *networking.VirtualService) error
+	Len() int
 }
 
 // IdentityVirtualServiceCache holds VS that are in identity's NS
@@ -188,6 +190,12 @@ func (i *IdentityVirtualServiceCache) Delete(vs *networking.VirtualService) erro
 	return nil
 }
 
+func (i *IdentityVirtualServiceCache) Len() int {
+	defer i.mutex.RUnlock()
+	i.mutex.RLock()
+	return len(i.cache)
+}
+
 func getIdentitiesFromVSHostName(hostName string) []string {
 
 	if hostName == "" {
@@ -299,14 +307,17 @@ func (v *VirtualServiceController) Added(ctx context.Context, obj interface{}) e
 		return fmt.Errorf("type assertion failed, %v is not of type *v1alpha3.VirtualService", obj)
 	}
 	err := v.VirtualServiceCache.Put(vs)
+	log.Infof("VirtualServiceCache length: %d", v.VirtualServiceCache.Len())
 	if err != nil {
 		return err
 	}
 	err = v.HostToRouteDestinationCache.Put(vs)
+	log.Infof("HostToRouteDestinationCache length: %d", v.HostToRouteDestinationCache.Len())
 	if err != nil {
 		return err
 	}
 	v.IdentityVirtualServiceCache.Put(vs)
+	log.Infof("IdentityVirtualServiceCache length: %d", v.IdentityVirtualServiceCache.Len())
 	return v.VirtualServiceHandler.Added(ctx, vs)
 }
 
@@ -316,8 +327,11 @@ func (v *VirtualServiceController) Updated(ctx context.Context, obj interface{},
 		return fmt.Errorf("type assertion failed, %v is not of type *v1alpha3.VirtualService", obj)
 	}
 	v.VirtualServiceCache.Put(vs)
+	log.Infof("VirtualServiceCache length: %d", v.VirtualServiceCache.Len())
 	v.HostToRouteDestinationCache.Put(vs)
+	log.Infof("HostToRouteDestinationCache length: %d", v.HostToRouteDestinationCache.Len())
 	v.IdentityVirtualServiceCache.Put(vs)
+	log.Infof("IdentityVirtualServiceCache length: %d", v.IdentityVirtualServiceCache.Len())
 	return v.VirtualServiceHandler.Updated(ctx, vs)
 }
 
@@ -366,6 +380,12 @@ func (sec *VirtualServiceController) Get(ctx context.Context, isRetry bool, obj
 	return nil, fmt.Errorf("istio client is not initialized, txId=%s", ctx.Value("txId"))
 }
 
+func (vs *VirtualServiceCache) Len() int {
+	defer vs.mutex.RUnlock()
+	vs.mutex.RLock()
+	return len(vs.cache)
+}
+
 func (v *VirtualServiceCache) GetVSProcessStatus(vs *networking.VirtualService) string {
 	if vs == nil {
 		return common.NotProcessed
@@ -453,3 +473,9 @@ func (h *HostToRouteDestinationCache) Delete(vs *networking.VirtualService) erro
 	}
 	return nil
 }
+
+func (h *HostToRouteDestinationCache) Len() int {
+	defer h.mutex.RUnlock()
+	h.mutex.RLock()
+	return len(h.cache)
+}