From: Oleg Mitsura <oleg.mitsura@amdocs.com>
Date: Tue, 5 Nov 2019 20:37:15 +0000 (-0500)
Subject: netconf retry disconnect()
X-Git-Tag: 0.7.0~168
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F97988%2F1;p=ccsdk%2Fcds.git

netconf retry disconnect()

Issue-ID: CCSDK-1908

Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: I90ca822c042ec84fda717a152c4f699bacdd87ad
---

diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImpl.kt b/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImpl.kt
index a0f653591..69b9d70bf 100644
--- a/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImpl.kt
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImpl.kt
@@ -66,8 +66,15 @@ class NetconfSessionImpl(private val deviceInfo: DeviceInfo, private val rpcServ
     }
 
     override fun disconnect() {
-        if (rpcService.closeSession(false).status.equals(
-                RpcStatus.FAILURE, true)) {
+        var retryNum = 3
+        while(rpcService.closeSession(false).status
+                .equals(RpcStatus.FAILURE, true) &&retryNum>0) {
+            log.error("disconnect: graceful disconnect failed, attempt $retryNum")
+            retryNum--;
+        }
+        //if we can't close the session, try to force terminate.
+        if(retryNum == 0) {
+            log.error("disconnect: trying to force-terminate the session.")
             rpcService.closeSession(true)
         }
         try {
@@ -276,6 +283,7 @@ class NetconfSessionImpl(private val deviceInfo: DeviceInfo, private val rpcServ
      */
     @Throws(IOException::class)
     private fun close() {
+        log.debug("close was called.")
         session.close()
         // Closes the socket which should interrupt the streamHandler
         channel.close()