X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=6abdcdb63afc46b223e5206e371f0e97706e3034;hb=refs%2Fchanges%2F30%2F2330%2F3;hp=c27e6a2ca967f390c9a9d62208461e66e0523d28;hpb=7e9c5e52615fef7cbc23de28505e1a7292cdf14f;p=ric-plt%2Fsubmgr.git diff --git a/pkg/control/registry.go b/pkg/control/registry.go index c27e6a2..6abdcdb 100644 --- a/pkg/control/registry.go +++ b/pkg/control/registry.go @@ -21,8 +21,10 @@ package control import ( "fmt" + "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" "sync" + "time" ) //----------------------------------------------------------------------------- @@ -35,7 +37,6 @@ type Registry struct { rtmgrClient *RtmgrClient } -// This method should run as a constructor func (r *Registry) Initialize() { r.register = make(map[uint16]*Subscription) var i uint16 @@ -44,61 +45,188 @@ func (r *Registry) Initialize() { } } -// Reserves and returns the next free sequence number -func (r *Registry) ReserveSubscription(endPoint *RmrEndpoint, meid *xapp.RMRMeid) (*Subscription, error) { - // Check is current SequenceNumber valid - // Allocate next SequenceNumber value and retry N times - r.mutex.Lock() - defer r.mutex.Unlock() - var subs *Subscription = nil - var retrytimes uint16 = 1000 - for ; subs == nil && retrytimes > 0; retrytimes-- { +func (r *Registry) allocateSubs(trans *Transaction, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) { + if len(r.subIds) > 0 { sequenceNumber := r.subIds[0] r.subIds = r.subIds[1:] - if _, ok := r.register[sequenceNumber]; ok == false { - subs := &Subscription{ - registry: r, - Seq: sequenceNumber, - Active: false, - RmrEndpoint: *endPoint, - Meid: meid, - Trans: nil, + if _, ok := r.register[sequenceNumber]; ok == true { + r.subIds = append(r.subIds, sequenceNumber) + return nil, fmt.Errorf("Registry: Failed to reserve subscription exists") + } + subs := &Subscription{ + registry: r, + Seq: sequenceNumber, + Meid: trans.Meid, + SubReqMsg: subReqMsg, + valid: true, + } + + if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false { + r.subIds = append(r.subIds, subs.Seq) + return nil, fmt.Errorf("Registry: Endpoint existing already in subscription") + } + + return subs, nil + } + return nil, fmt.Errorf("Registry: Failed to reserve subscription no free ids") +} + +func (r *Registry) findExistingSubs(trans *Transaction, subReqMsg *e2ap.E2APSubscriptionRequest) *Subscription { + for _, subs := range r.register { + if subs.IsSame(trans, subReqMsg) { + + // + // check if there has been race conditions + // + subs.mutex.Lock() + //subs has been set to invalid + if subs.valid == false { + subs.mutex.Unlock() + continue } - r.register[sequenceNumber] = subs - - // Update routing - r.mutex.Unlock() - err := subs.UpdateRoute(CREATE) - r.mutex.Lock() - if err != nil { - if _, ok := r.register[sequenceNumber]; ok { - delete(r.register, sequenceNumber) - } - return nil, err + // try to add to endpointlist. + if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false { + subs.mutex.Unlock() + continue } - return subs, nil + subs.mutex.Unlock() + + //Race collision during parallel incoming and deleted + xapp.Logger.Debug("Registry: Identical subs found %s for %s", subs.String(), trans.String()) + return subs } } - return nil, fmt.Errorf("Registry: Failed to reserves subscription. RmrEndpoint: %s, Meid: %s", endPoint, meid.RanName) + return nil +} + +func (r *Registry) AssignToSubscription(trans *Transaction, subReqMsg *e2ap.E2APSubscriptionRequest) (*Subscription, error) { + var err error + var newAlloc bool + r.mutex.Lock() + defer r.mutex.Unlock() + + subs := r.findExistingSubs(trans, subReqMsg) + + if subs == nil { + subs, err = r.allocateSubs(trans, subReqMsg) + if err != nil { + return nil, err + } + newAlloc = true + } + + // + // Add to subscription + // + subs.mutex.Lock() + defer subs.mutex.Unlock() + + epamount := subs.EpList.Size() + + r.mutex.Unlock() + // + // Subscription route updates + // + if epamount == 1 { + subRouteAction := SubRouteInfo{CREATE, subs.EpList, subs.Seq} + err = r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + } else { + subRouteAction := SubRouteInfo{UPDATE, subs.EpList, subs.Seq} + err = r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + } + r.mutex.Lock() + + if err != nil { + if newAlloc { + r.subIds = append(r.subIds, subs.Seq) + } + return nil, err + } + + if newAlloc { + r.register[subs.Seq] = subs + } + xapp.Logger.Debug("Registry: Create %s", subs.String()) + xapp.Logger.Debug("Registry: substable=%v", r.register) + return subs, nil +} + +// TODO: Needs better logic when there is concurrent calls +func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction, waitRouteClean time.Duration) error { + + r.mutex.Lock() + defer r.mutex.Unlock() + subs.mutex.Lock() + defer subs.mutex.Unlock() + + delStatus := subs.EpList.DelEndpoint(trans.GetEndpoint()) + epamount := subs.EpList.Size() + + // + // If last endpoint remove from register map + // + if epamount == 0 { + if _, ok := r.register[subs.Seq]; ok { + xapp.Logger.Debug("Registry: Delete %s", subs.String()) + delete(r.register, subs.Seq) + xapp.Logger.Debug("Registry: substable=%v", r.register) + } + } + r.mutex.Unlock() + + // + // Wait some time before really do route updates + // + if waitRouteClean > 0 { + subs.mutex.Unlock() + time.Sleep(waitRouteClean) + subs.mutex.Lock() + } + + xapp.Logger.Info("Registry: Cleaning %s", subs.String()) + + // + // Subscription route updates + // + if delStatus { + if epamount == 0 { + tmpList := RmrEndpointList{} + tmpList.AddEndpoint(trans.GetEndpoint()) + subRouteAction := SubRouteInfo{DELETE, tmpList, subs.Seq} + r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + } else { + subRouteAction := SubRouteInfo{UPDATE, subs.EpList, subs.Seq} + r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction) + } + } + + r.mutex.Lock() + // + // If last endpoint free seq nro + // + if epamount == 0 { + r.subIds = append(r.subIds, subs.Seq) + } + + return nil } func (r *Registry) GetSubscription(sn uint16) *Subscription { r.mutex.Lock() defer r.mutex.Unlock() - xapp.Logger.Debug("Registry map: %v", r.register) if _, ok := r.register[sn]; ok { return r.register[sn] } return nil } -func (r *Registry) DelSubscription(sn uint16) bool { +func (r *Registry) GetSubscriptionFirstMatch(ids []uint16) (*Subscription, error) { r.mutex.Lock() defer r.mutex.Unlock() - if _, ok := r.register[sn]; ok { - r.subIds = append(r.subIds, sn) - delete(r.register, sn) - return true + for _, id := range ids { + if _, ok := r.register[id]; ok { + return r.register[id], nil + } } - return false + return nil, fmt.Errorf("No valid subscription found with ids %v", ids) }