From c4d387d216e72911f80c1ebee91b73aba191b91b Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Thu, 28 Mar 2019 11:00:54 +0200 Subject: Make Cassandra port configurable. SDC-BE & Onboarding - BE. Reviewer: Evgenia A & Areli F. Change-Id: Iaf86d647b0560764ef65d9148c85bffaf934992d Issue-ID: SDC-2077 Signed-off-by: Tal Gitelman --- .../org/openecomp/sdc/be/dao/cassandra/CassandraClient.java | 10 +++++----- .../openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'catalog-dao/src/main/java') diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/CassandraClient.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/CassandraClient.java index 8889cc212e..028247d75a 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/CassandraClient.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/CassandraClient.java @@ -49,15 +49,16 @@ public class CassandraClient { try { cassandraHosts = ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig() .getCassandraHosts(); + Integer cassandraPort = ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig() + .getCassandraPort(); Long reconnectTimeout = ConfigurationManager.getConfigurationManager().getConfiguration() .getCassandraConfig().getReconnectTimeout(); - - logger.debug("creating cluster to hosts:{} with reconnect timeout:{}", cassandraHosts, reconnectTimeout); + logger.debug("creating cluster to hosts:{} port:{} with reconnect timeout:{}", cassandraHosts, cassandraPort, reconnectTimeout); Cluster.Builder clusterBuilder = Cluster.builder() .withReconnectionPolicy(new ConstantReconnectionPolicy(reconnectTimeout)) .withRetryPolicy(DefaultRetryPolicy.INSTANCE); - cassandraHosts.forEach(clusterBuilder::addContactPoint); + cassandraHosts.forEach(host -> clusterBuilder.addContactPoint(host).withPort(cassandraPort)); setSocketOptions(clusterBuilder); enableAuthentication(clusterBuilder); enableSsl(clusterBuilder); @@ -154,8 +155,7 @@ public class CassandraClient { return Either.right(CassandraOperationStatus.KEYSPACE_NOT_CONNECTED); } } catch (Throwable e) { - logger.debug("Failed to connect to keyspace [{}], error ,", keyspace); - logger.debug("Exception :", e); + logger.debug("Failed to connect to keyspace [{}], error :", keyspace, e); return Either.right(CassandraOperationStatus.KEYSPACE_NOT_CONNECTED); } } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java index 7531ad4c0a..e6b091b72f 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java @@ -44,13 +44,14 @@ public class SdcSchemaUtils { public Cluster createCluster() { final Configuration.CassandrConfig config = getCassandraConfig(); List nodes = config.getCassandraHosts(); - if (nodes == null) { - log.info("no nodes were supplied in configuration."); + Integer cassandraPort = config.getCassandraPort(); + if (nodes == null || cassandraPort == null) { + log.info("no nodes or port were supplied in configuration."); return null; } - log.info("connecting to node:{}.", nodes); + log.info("connecting to node:{} port{}.", nodes, cassandraPort); Cluster.Builder clusterBuilder = Cluster.builder(); - nodes.forEach(clusterBuilder::addContactPoint); + nodes.forEach(node -> clusterBuilder.addContactPoint(node).withPort(cassandraPort)); clusterBuilder.withMaxSchemaAgreementWaitSeconds(60); -- cgit 1.2.3-korg