X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fcontrol.go;h=98a2474e8920f122671f46c0ae8c237641613461;hb=7348625b9ef03d41dd5a0ca0f6c508376259717e;hp=7b0760c31cd156b60e5b4bb89b117074e1614e4c;hpb=c9eb08a02821033f198fcde1ea60279b19c5c617;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/control.go b/pkg/control/control.go
index 7b0760c..98a2474 100755
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -103,7 +103,7 @@ func NewControl() *Control {
 		//subscriber: subscriber,
 	}
 	c.XappWrapper.Init("")
-	go xapp.Subscription.Listen(c.SubscriptionHandler, c.QueryHandler)
+	go xapp.Subscription.Listen(c.SubscriptionHandler, c.QueryHandler, c.SubscriptionDeleteHandler)
 	//go c.subscriber.Listen(c.SubscriptionHandler, c.QueryHandler)
 	return c
 }
@@ -122,7 +122,7 @@ func (c *Control) Run() {
 //-------------------------------------------------------------------
 //
 //-------------------------------------------------------------------
-func (c *Control) SubscriptionHandler(stype models.SubscriptionType, params interface{}) (models.SubscriptionResult, error) {
+func (c *Control) SubscriptionHandler(stype models.SubscriptionType, params interface{}) (*models.SubscriptionResponse, error) {
 	/*
 	   switch p := params.(type) {
 	   case *models.ReportParams:
@@ -136,7 +136,11 @@ func (c *Control) SubscriptionHandler(stype models.SubscriptionType, params inte
 	   case *models.PolicyParams:
 	   }
 	*/
-	return models.SubscriptionResult{}, fmt.Errorf("Subscription rest interface not implemented")
+	return &models.SubscriptionResponse{}, fmt.Errorf("Subscription rest interface not implemented")
+}
+
+func (c *Control) SubscriptionDeleteHandler(string) error {
+	return fmt.Errorf("Subscription rest interface not implemented")
 }
 
 func (c *Control) QueryHandler() (models.SubscriptionList, error) {
@@ -158,7 +162,7 @@ func (c *Control) rmrSendToE2T(desc string, subs *Subscription, trans *Transacti
 	params.Payload = trans.Payload.Buf
 	params.Mbuf = nil
 	xapp.Logger.Info("MSG to E2T: %s %s %s", desc, trans.String(), params.String())
-	return c.RmrSend(params)
+	return c.RmrSend(params, 5)
 }
 
 func (c *Control) rmrSendToXapp(desc string, subs *Subscription, trans *TransactionXapp) (err error) {
@@ -173,7 +177,7 @@ func (c *Control) rmrSendToXapp(desc string, subs *Subscription, trans *Transact
 	params.Payload = trans.Payload.Buf
 	params.Mbuf = nil
 	xapp.Logger.Info("MSG to XAPP: %s %s %s", desc, trans.String(), params.String())
-	return c.RmrSend(params)
+	return c.RmrSend(params, 5)
 }
 
 func (c *Control) Consume(params *xapp.RMRParams) (err error) {
@@ -218,7 +222,7 @@ func (c *Control) handleXAPPSubscriptionRequest(params *xapptweaks.RMRParams) {
 		return
 	}
 
-	trans := c.tracker.NewXappTransaction(NewRmrEndpoint(params.Src), params.Xid, subReqMsg.RequestId.Seq, params.Meid)
+	trans := c.tracker.NewXappTransaction(xapptweaks.NewRmrEndpoint(params.Src), params.Xid, subReqMsg.RequestId.Seq, params.Meid)
 	if trans == nil {
 		xapp.Logger.Error("XAPP-SubReq: %s", idstring(fmt.Errorf("transaction not created"), params))
 		return
@@ -231,6 +235,7 @@ func (c *Control) handleXAPPSubscriptionRequest(params *xapptweaks.RMRParams) {
 		return
 	}
 
+	//TODO handle subscription toward e2term inside AssignToSubscription / hide handleSubscriptionCreate in it?
 	subs, err := c.registry.AssignToSubscription(trans, subReqMsg)
 	if err != nil {
 		xapp.Logger.Error("XAPP-SubReq: %s", idstring(err, trans))
@@ -263,7 +268,7 @@ func (c *Control) handleXAPPSubscriptionRequest(params *xapptweaks.RMRParams) {
 		}
 	}
 	xapp.Logger.Info("XAPP-SubReq: failed %s", idstring(err, trans, subs))
-	c.registry.RemoveFromSubscription(subs, trans, 5*time.Second)
+	//c.registry.RemoveFromSubscription(subs, trans, 5*time.Second)
 }
 
 //-------------------------------------------------------------------
@@ -278,7 +283,7 @@ func (c *Control) handleXAPPSubscriptionDeleteRequest(params *xapptweaks.RMRPara
 		return
 	}
 
-	trans := c.tracker.NewXappTransaction(NewRmrEndpoint(params.Src), params.Xid, subDelReqMsg.RequestId.Seq, params.Meid)
+	trans := c.tracker.NewXappTransaction(xapptweaks.NewRmrEndpoint(params.Src), params.Xid, subDelReqMsg.RequestId.Seq, params.Meid)
 	if trans == nil {
 		xapp.Logger.Error("XAPP-SubDelReq: %s", idstring(fmt.Errorf("transaction not created"), params))
 		return
@@ -314,7 +319,8 @@ func (c *Control) handleXAPPSubscriptionDeleteRequest(params *xapptweaks.RMRPara
 		c.rmrSendToXapp("", subs, trans)
 	}
 
-	c.registry.RemoveFromSubscription(subs, trans, 5*time.Second)
+	//TODO handle subscription toward e2term insiged RemoveFromSubscription / hide handleSubscriptionDelete in it?
+	//c.registry.RemoveFromSubscription(subs, trans, 5*time.Second)
 }
 
 //-------------------------------------------------------------------
@@ -331,22 +337,48 @@ func (c *Control) handleSubscriptionCreate(subs *Subscription, parentTrans *Tran
 
 	subRfMsg, valid := subs.GetCachedResponse()
 	if subRfMsg == nil && valid == true {
-		event := c.sendE2TSubscriptionRequest(subs, trans, parentTrans)
-		switch event.(type) {
-		case *e2ap.E2APSubscriptionResponse:
-			subRfMsg, valid = subs.SetCachedResponse(event, true)
-		case *e2ap.E2APSubscriptionFailure:
-			subRfMsg, valid = subs.SetCachedResponse(event, false)
-		default:
-			xapp.Logger.Info("SUBS-SubReq: internal delete due event(%s) %s", typeofSubsMessage(event), idstring(nil, trans, subs, parentTrans))
-			subRfMsg, valid = subs.SetCachedResponse(nil, false)
-			c.sendE2TSubscriptionDeleteRequest(subs, trans, parentTrans)
+
+		//
+		// In case of failure
+		// - make internal delete
+		// - in case duplicate cause, retry (currently max 1 retry)
+		//
+		maxRetries := uint64(1)
+		doRetry := true
+		for retries := uint64(0); retries <= maxRetries && doRetry; retries++ {
+			doRetry = false
+
+			event := c.sendE2TSubscriptionRequest(subs, trans, parentTrans)
+			switch themsg := event.(type) {
+			case *e2ap.E2APSubscriptionResponse:
+				subRfMsg, valid = subs.SetCachedResponse(event, true)
+			case *e2ap.E2APSubscriptionFailure:
+				subRfMsg, valid = subs.SetCachedResponse(event, false)
+				doRetry = true
+				for _, item := range themsg.ActionNotAdmittedList.Items {
+					if item.Cause.Content != e2ap.E2AP_CauseContent_Ric || (item.Cause.Value != e2ap.E2AP_CauseValue_Ric_duplicate_action && item.Cause.Value != e2ap.E2AP_CauseValue_Ric_duplicate_event) {
+						doRetry = false
+						break
+					}
+				}
+				xapp.Logger.Info("SUBS-SubReq: internal delete and possible retry due event(%s) retry(%t,%d/%d) %s", typeofSubsMessage(event), doRetry, retries, maxRetries, idstring(nil, trans, subs, parentTrans))
+				c.sendE2TSubscriptionDeleteRequest(subs, trans, parentTrans)
+			default:
+				xapp.Logger.Info("SUBS-SubReq: internal delete due event(%s) %s", typeofSubsMessage(event), idstring(nil, trans, subs, parentTrans))
+				subRfMsg, valid = subs.SetCachedResponse(nil, false)
+				c.sendE2TSubscriptionDeleteRequest(subs, trans, parentTrans)
+			}
 		}
+
 		xapp.Logger.Debug("SUBS-SubReq: Handling (e2t response %s) %s", typeofSubsMessage(subRfMsg), idstring(nil, trans, subs, parentTrans))
 	} else {
 		xapp.Logger.Debug("SUBS-SubReq: Handling (cached response %s) %s", typeofSubsMessage(subRfMsg), idstring(nil, trans, subs, parentTrans))
 	}
 
+	//Now RemoveFromSubscription in here to avoid race conditions (mostly concerns delete)
+	if valid == false {
+		c.registry.RemoveFromSubscription(subs, parentTrans, 5*time.Second)
+	}
 	parentTrans.SendEvent(subRfMsg, 0)
 }
 
@@ -371,7 +403,10 @@ func (c *Control) handleSubscriptionDelete(subs *Subscription, parentTrans *Tran
 	} else {
 		subs.mutex.Unlock()
 	}
-
+	//Now RemoveFromSubscription in here to avoid race conditions (mostly concerns delete)
+	//  If parallel deletes ongoing both might pass earlier sendE2TSubscriptionDeleteRequest(...) if
+	//  RemoveFromSubscription locates in caller side (now in handleXAPPSubscriptionDeleteRequest(...))
+	c.registry.RemoveFromSubscription(subs, parentTrans, 5*time.Second)
 	parentTrans.SendEvent(nil, 0)
 }