From: Konstantinos Archangelof <konstantinos.archangelof@nokia.com>
Date: Thu, 21 Jul 2022 09:05:19 +0000 (+0300)
Subject: bug fix
X-Git-Tag: 0.9.5~5
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=3a9697375fa1ebb0d39e7516756b08fcb64f4cb8;p=ric-plt%2Fsubmgr.git

bug fix
  * minor bug fix for hanging REST Subscriptions in E2 node down case.

Signed-off-by: Konstantinos Archangelof <konstantinos.archangelof@nokia.com>
Change-Id: Ia7934ef41595fd5ca78e662e4bc0174644d5e714
---

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index f9e1bcc..88a4cc5 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -657,15 +657,17 @@ func (r *Registry) DeleteAllE2Subscriptions(ranName string, c *Control) {
 
 	// Delete REST subscription from registry and db
 	for restSubId, restSubs := range r.restSubscriptions {
-		if restSubs.Meid == ranName && restSubs.SubReqOngoing == true || restSubs.SubDelReqOngoing == true {
-			// Subscription creation or deletion processes need to be processed gracefully till the end.
-			// Subscription is deleted at end of the process in both cases.
-			xapp.Logger.Debug("Registry: REST subscription under prosessing ongoing cannot delete it yet. RestSubId=%v, SubReqOngoing=%v, SubDelReqOngoing=%v", restSubId, restSubs.SubReqOngoing, restSubs.SubDelReqOngoing)
-			continue
-		} else {
-			xapp.Logger.Debug("Registry: REST subscription delete. subId=%v", restSubId)
-			delete(r.restSubscriptions, restSubId)
-			c.RemoveRESTSubscriptionFromDb(restSubId)
+		if restSubs.Meid == ranName {
+			if restSubs.SubReqOngoing == true || restSubs.SubDelReqOngoing == true {
+				// Subscription creation or deletion processes need to be processed gracefully till the end.
+				// Subscription is deleted at end of the process in both cases.
+				xapp.Logger.Debug("Registry: REST subscription under prosessing ongoing cannot delete it yet. RestSubId=%v, SubReqOngoing=%v, SubDelReqOngoing=%v", restSubId, restSubs.SubReqOngoing, restSubs.SubDelReqOngoing)
+				continue
+			} else {
+				xapp.Logger.Debug("Registry: REST subscription delete. subId=%v", restSubId)
+				delete(r.restSubscriptions, restSubId)
+				c.RemoveRESTSubscriptionFromDb(restSubId)
+			}
 		}
 	}
 }