[VOL-5482] dont wait on WaitOnRxStreamCloseCh() during adapter version upgrade
Signed-off-by: bseeniva <balaji.seenivasan@radisys.com>
Change-Id: I6812047ac6caf496aa6549cfed8b44bfe5db5dc0
diff --git a/VERSION b/VERSION
index 601c643..c241e96 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6.17
+3.6.18
diff --git a/rw_core/core/adapter/manager.go b/rw_core/core/adapter/manager.go
index 2788a3b..6ff216d 100644
--- a/rw_core/core/adapter/manager.go
+++ b/rw_core/core/adapter/manager.go
@@ -544,25 +544,6 @@
delete(aMgr.rxStreamCloseChMap, endpoint)
}
-func (aMgr *Manager) WaitOnRxStreamCloseCh(ctx context.Context, endpoint string) {
- var closeCh chan bool
- ok := false
- aMgr.rxStreamCloseChLock.RLock()
- if closeCh, ok = aMgr.rxStreamCloseChMap[endpoint]; !ok {
- logger.Warnw(ctx, "no entry on rxStreamCloseChMap", log.Fields{"endpoint": endpoint})
- aMgr.rxStreamCloseChLock.RUnlock()
- return
- }
- aMgr.rxStreamCloseChLock.RUnlock()
-
- select {
- case <-closeCh:
- logger.Infow(ctx, "rx stream closed for endpoint", log.Fields{"endpoint": endpoint})
- case <-time.After(60 * time.Second):
- logger.Warnw(ctx, "timeout waiting for rx stream close", log.Fields{"endpoint": endpoint})
- }
-}
-
func (aMgr *Manager) getAgent(ctx context.Context, adapterID string) (*agent, error) {
aMgr.lockAdapterAgentsMap.RLock()
defer aMgr.lockAdapterAgentsMap.RUnlock()
diff --git a/rw_core/core/device/manager.go b/rw_core/core/device/manager.go
index 1a2e5f6..e27ea43 100755
--- a/rw_core/core/device/manager.go
+++ b/rw_core/core/device/manager.go
@@ -866,9 +866,6 @@
if a, _ := dMgr.adapterMgr.GetAdapterWithEndpoint(ctx, endpoint); a != nil {
if rollingUpdate, _ := dMgr.adapterMgr.GetRollingUpdate(ctx, endpoint); rollingUpdate {
dMgr.adapterMgr.RegisterOnRxStreamCloseChMap(ctx, endpoint)
- // Blocking call. wait for the old adapters rx stream to close.
- // That is a signal that the old adapter is completely down
- dMgr.adapterMgr.WaitOnRxStreamCloseCh(ctx, endpoint)
dMgr.adapterMgr.DeleteRollingUpdate(ctx, endpoint)
// In case of rolling update we need to start the connection towards the new adapter instance now
if err := dMgr.adapterMgr.StartAdapterWithEndPoint(ctx, endpoint); err != nil {