From 4654da998f4cd9390e2e1a02f4aa2bdf198893c0 Mon Sep 17 00:00:00 2001 From: "k.kedron" Date: Fri, 13 Mar 2020 17:15:14 +0100 Subject: Remove hardcoded timeout Added configuration for wait seconds for Cassandra connector. Also, increase the timeout value to prevent tests failed. Issue-ID: SDC-2759 Signed-off-by: Krystian Kedron Change-Id: I1008ecce98efdd8627ac3232b35fecd2a41a9c79 --- .../cookbooks/cassandra-actions/templates/default/configuration.yaml.erb | 1 + asdctool/src/main/resources/config/configuration.yaml | 1 + asdctool/src/main/resources/config/janusgraph.properties | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) (limited to 'asdctool') diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb index 5147881bde..90a02934b5 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb @@ -83,6 +83,7 @@ cassandraConfig: ssl: false truststorePath : /config/.truststore truststorePassword : Aa123456 + maxWaitSeconds: 120 keySpaces: - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']} - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']} diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml index 69f82ac72f..5a88cf040a 100644 --- a/asdctool/src/main/resources/config/configuration.yaml +++ b/asdctool/src/main/resources/config/configuration.yaml @@ -99,6 +99,7 @@ cassandraConfig: ssl: true truststorePath : C:/Users/im453s/git/vagrant-sdc-all-in-one/tmp.trust truststorePassword : Aa123456 + maxWaitSeconds: 120 keySpaces: - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-AIO-Ubuntu1', '1']} - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-AIO-Ubuntu1', '1']} diff --git a/asdctool/src/main/resources/config/janusgraph.properties b/asdctool/src/main/resources/config/janusgraph.properties index e0b844f554..8462756129 100644 --- a/asdctool/src/main/resources/config/janusgraph.properties +++ b/asdctool/src/main/resources/config/janusgraph.properties @@ -16,7 +16,6 @@ storage.cql.replication-strategy-class=org.apache.cassandra.locator.NetworkTopol storage.cql.replication-strategy-options=DC-sdc-iltlv633,1 storage.cql.local-datacenter=DC-sdc-iltlv633 - cache.db-cache = false cache.db-cache-clean-wait = 20 cache.db-cache-time = 180000 -- cgit 1.2.3-korg