From 084009b62202c25ee9a3020a9943ef335b898df3 Mon Sep 17 00:00:00 2001 From: Julien Fontaine Date: Wed, 20 Jan 2021 18:28:49 -0500 Subject: Fixed error when uploading CBA when Hazelcast cluster is not initialized Hazelcast is used to enable CDS pods to notify the rest of the CDS cluster when a CBA got updated locally so they clean their compile cache (if they have an entry for that CBA). Though, the code doesn't make sure that hazelcast cluster is fully initialized before trying to notify using a hazelcast topic. Fixed that error by making sure that the cluster is fully initialized before pushing notification to hazelcast topic. Issue-ID: CCSDK-3277 Change-Id: I44211c63c5a991269005bcc238f18b19979cb718 Signed-off-by: Julien Fontaine --- .../db/primary/service/BlueprintProcessorCatalogServiceImpl.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintProcessorCatalogServiceImpl.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintProcessorCatalogServiceImpl.kt index 10a526365..5b9853855 100755 --- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintProcessorCatalogServiceImpl.kt +++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintProcessorCatalogServiceImpl.kt @@ -180,11 +180,9 @@ class BlueprintProcessorCatalogServiceImpl( private suspend fun cleanClassLoader(cacheKey: String) { val clusterService = BlueprintDependencyService.optionalClusterService() - if (null == clusterService) - BlueprintCompileCache.cleanClassLoader(cacheKey) - else { + if (clusterService != null && clusterService.clusterJoined()) { log.info("Sending ClusterMessage: Clean Classloader Cache") clusterService.sendMessage(BlueprintClusterTopic.BLUEPRINT_CLEAN_COMPILER_CACHE, cacheKey) - } + } else BlueprintCompileCache.cleanClassLoader(cacheKey) } } -- cgit 1.2.3-korg