Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the memory leak, where xds resources getting accumulated over time #3460

Merged
merged 1 commit into from
Nov 21, 2023
Merged

Fix the memory leak, where xds resources getting accumulated over time #3460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions adapter/internal/discovery/xds/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,8 +981,7 @@ func UpdateEnforcerSubscriptions(subscriptions *subscription.SubscriptionList) {
//TODO: (Dinusha) check this hardcoded value
logger.LoggerXds.Debug("Updating Enforcer Subscription Cache")
label := commonEnforcerLabel
subscriptionList := enforcerSubscriptionMap[label]
subscriptionList = append(subscriptionList, subscriptions)
subscriptionList := append([]types.Resource{}, subscriptions)

// TODO: (VirajSalaka) Decide if a map is required to keep version (just to avoid having the same version)
version := rand.Intn(maxRandomInt)
Expand All @@ -1003,8 +1002,7 @@ func UpdateEnforcerSubscriptions(subscriptions *subscription.SubscriptionList) {
func UpdateEnforcerApplications(applications *subscription.ApplicationList) {
logger.LoggerXds.Debug("Updating Enforcer Application Cache")
label := commonEnforcerLabel
applicationList := enforcerApplicationMap[label]
applicationList = append(applicationList, applications)
applicationList := append([]types.Resource{}, applications)

version := rand.Intn(maxRandomInt)
snap, _ := wso2_cache.NewSnapshot(fmt.Sprint(version), map[wso2_resource.Type][]types.Resource{
Expand All @@ -1023,8 +1021,7 @@ func UpdateEnforcerApplications(applications *subscription.ApplicationList) {
// UpdateEnforcerAPIList sets new update to the enforcer's Apis
func UpdateEnforcerAPIList(label string, apis *subscription.APIList) {
logger.LoggerXds.Debug("Updating Enforcer API Cache")
apiList := enforcerAPIListMap[label]
apiList = append(apiList, apis)
apiList := append([]types.Resource{}, apis)

version := rand.Intn(maxRandomInt)
snap, _ := wso2_cache.NewSnapshot(fmt.Sprint(version), map[wso2_resource.Type][]types.Resource{
Expand All @@ -1044,8 +1041,7 @@ func UpdateEnforcerAPIList(label string, apis *subscription.APIList) {
func UpdateEnforcerApplicationPolicies(applicationPolicies *subscription.ApplicationPolicyList) {
logger.LoggerXds.Debug("Updating Enforcer Application Policy Cache")
label := commonEnforcerLabel
applicationPolicyList := enforcerApplicationPolicyMap[label]
applicationPolicyList = append(applicationPolicyList, applicationPolicies)
applicationPolicyList := append([]types.Resource{}, applicationPolicies)

version := rand.Intn(maxRandomInt)
snap, _ := wso2_cache.NewSnapshot(fmt.Sprint(version), map[wso2_resource.Type][]types.Resource{
Expand All @@ -1065,8 +1061,7 @@ func UpdateEnforcerApplicationPolicies(applicationPolicies *subscription.Applica
func UpdateEnforcerSubscriptionPolicies(subscriptionPolicies *subscription.SubscriptionPolicyList) {
logger.LoggerXds.Debug("Updating Enforcer Subscription Policy Cache")
label := commonEnforcerLabel
subscriptionPolicyList := enforcerSubscriptionPolicyMap[label]
subscriptionPolicyList = append(subscriptionPolicyList, subscriptionPolicies)
subscriptionPolicyList := append([]types.Resource{}, subscriptionPolicies)

version := rand.Intn(maxRandomInt)
snap, _ := wso2_cache.NewSnapshot(fmt.Sprint(version), map[wso2_resource.Type][]types.Resource{
Expand All @@ -1092,8 +1087,7 @@ func UpdateEnforcerSubscriptionPolicies(subscriptionPolicies *subscription.Subsc
func UpdateEnforcerApplicationKeyMappings(applicationKeyMappings *subscription.ApplicationKeyMappingList) {
logger.LoggerXds.Debug("Updating Application Key Mapping Cache")
label := commonEnforcerLabel
applicationKeyMappingList := enforcerApplicationKeyMappingMap[label]
applicationKeyMappingList = append(applicationKeyMappingList, applicationKeyMappings)
applicationKeyMappingList := append([]types.Resource{}, applicationKeyMappings)

version := rand.Intn(maxRandomInt)
snap, _ := wso2_cache.NewSnapshot(fmt.Sprint(version), map[wso2_resource.Type][]types.Resource{
Expand Down Expand Up @@ -1237,8 +1231,7 @@ func UpdateEnforcerKeyManagers(keyManagerConfigList []types.Resource) {
func UpdateEnforcerRevokedTokens(revokedTokens []types.Resource) {
logger.LoggerXds.Debug("Updating enforcer cache for revoked tokens")
label := commonEnforcerLabel
tokens := enforcerRevokedTokensMap[label]
tokens = append(tokens, revokedTokens...)
tokens := append([]types.Resource{}, revokedTokens...)

version := rand.Intn(maxRandomInt)
snap, _ := wso2_cache.NewSnapshot(fmt.Sprint(version), map[wso2_resource.Type][]types.Resource{
Expand Down
Loading