X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fsbi%2Fnngpush.go;h=7ba43c552f29db6bc25cdd16845aeb1d4f588471;hb=e27ecb21e2be4644bfc0da5b1e8670f4dd1f9c81;hp=ec4d25a2da504b7d53ce34ae42bcc005072e96ea;hpb=505e2497ce651c1127ffbcefe396b3f8c0d0f9dd;p=ric-plt%2Frtmgr.git diff --git a/pkg/sbi/nngpush.go b/pkg/sbi/nngpush.go index ec4d25a..7ba43c5 100644 --- a/pkg/sbi/nngpush.go +++ b/pkg/sbi/nngpush.go @@ -49,7 +49,7 @@ import ( var rmrcallid = 1 var rmrdynamiccallid = 201 var addendpointct = 1 - +var count int var conn sync.Mutex type RmrPush struct { @@ -96,7 +96,7 @@ func (c *RmrPush) AddEndpoint(ep *rtmgr.Endpoint) error { time.Sleep(time.Duration(10) * time.Second) ep.Whid = int(xapp.Rmr.Openwh(endpoint)) if ep.Whid < 0 { - return errors.New("can't open warmhole connection for endpoint:" + ep.Uuid + " due to invalid Wormhole ID: " + string(ep.Whid) + " count: " + strconv.Itoa(count)) + return errors.New("cannot open wormhole connection for endpoint:" + ep.Uuid + " due to invalid Wormhole ID: " + string(ep.Whid) + " count: " + strconv.Itoa(count)) } } else { xapp.Logger.Debug("Wormhole ID is %v and EP is %v", ep.Whid, endpoint) @@ -144,7 +144,7 @@ func (c *RmrPush) DistributeAll(policies *[]string) error { if result[i].status == true { count++ } else { - xapp.Logger.Error("RMR send failed for endpoint %v", result[i].endpoint) + xapp.Logger.Error("RMR sent failed for endpoint %v", result[i].endpoint) } } @@ -160,6 +160,15 @@ func (c *RmrPush) send_sync(ep *rtmgr.Endpoint, policies *[]string, call_id int) xapp.Logger.Debug("Push policy to endpoint: " + ep.Uuid) ret := c.send_data(ep, policies, call_id) + for count = 0; count <= 2 && ret == false; count++ { + time.Sleep(time.Second) + ret := c.send_data(ep, policies, call_id) + if ret == true { + break + } + xapp.Logger.Error("Invoked send_data to try again due to return value : %v", ret) + } + conn.Lock() rtmgr.RMRConnStatus[ep.Uuid] = ret conn.Unlock()