summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Fontaine <julien.fontaine@bell.ca>2021-01-20 18:28:49 -0500
committerJulien Fontaine <julien.fontaine@bell.ca>2021-04-28 18:07:59 -0400
commit084009b62202c25ee9a3020a9943ef335b898df3 (patch)
tree78635757a986490f89df04788a73dfe1252ae219
parent83edeed4748644314453654aa853ad5674fc899e (diff)
Fixed error when uploading CBA when Hazelcast cluster is not initialized1.1.4
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 <julien.fontaine@bell.ca>
-rwxr-xr-xms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/BlueprintProcessorCatalogServiceImpl.kt6
1 files 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)
}
}