aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkjaniak <kornel.janiak@nokia.com>2019-01-24 07:29:50 +0100
committerkjaniak <kornel.janiak@nokia.com>2019-01-25 15:30:17 +0100
commit68a3cf84da13b6f97628c8a0cee86c3323c780ce (patch)
tree15b267e18a38355eb69c2668a5bf42fa3d589d61
parent26efcca92b010f749d98bc25e5749e1079f072ae (diff)
Mitigation of unexpected hv-ves shutdown
Change-Id: I96183e2358ac10457568d223f37d69c61dfd252d Issue-ID: DCAEGEN2-1117 Signed-off-by: kjaniak <kornel.janiak@nokia.com>
-rw-r--r--build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml1
-rw-r--r--sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt8
-rw-r--r--sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt2
3 files changed, 8 insertions, 3 deletions
diff --git a/build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml b/build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml
index e35dcc5e..36f092dd 100644
--- a/build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml
+++ b/build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml
@@ -116,6 +116,7 @@ complexity:
thresholdInObjects: 11
thresholdInEnums: 11
ignoreDeprecated: false
+ ignorePrivate: true
empty-blocks:
active: true
diff --git a/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt
index c76233f0..adc629bc 100644
--- a/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt
+++ b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt
@@ -93,7 +93,12 @@ internal class NettyTcpServer(private val serverConfig: ServerConfiguration,
}
logger.debug(clientContext::fullMdc, Marker.Entry) { "Client connection request received" }
- return collectorProvider(clientContext).fold(
+ messageHandlingStream(clientContext, nettyInbound).subscribe()
+ return nettyOutbound.neverComplete()
+ }
+
+ private fun messageHandlingStream(clientContext: ClientContext, nettyInbound: NettyInbound): Mono<Void> =
+ collectorProvider(clientContext).fold(
{
logger.warn(clientContext::fullMdc) { "Collector not ready. Closing connection..." }
Mono.empty()
@@ -108,7 +113,6 @@ internal class NettyTcpServer(private val serverConfig: ServerConfiguration,
it.handleConnection(createDataStream(nettyInbound))
}
)
- }
private fun populateClientContext(clientContext: ClientContext, connection: Connection) {
clientContext.clientAddress = try {
diff --git a/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt
index 8de7da32..db5e5e82 100644
--- a/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt
+++ b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt
@@ -22,9 +22,9 @@ package org.onap.dcae.collectors.veshv.simulators.xnf.impl.adapters
import arrow.core.Option
import arrow.core.getOrElse
import io.netty.handler.ssl.SslContext
-import org.onap.dcae.collectors.veshv.domain.WireFrameMessage
import org.onap.dcae.collectors.veshv.domain.SecurityConfiguration
import org.onap.dcae.collectors.veshv.domain.WireFrameEncoder
+import org.onap.dcae.collectors.veshv.domain.WireFrameMessage
import org.onap.dcae.collectors.veshv.simulators.xnf.impl.config.SimulatorConfiguration
import org.onap.dcae.collectors.veshv.ssl.boundary.ClientSslContextFactory
import org.onap.dcae.collectors.veshv.utils.arrow.asIo