Commit 867b7882 authored by Michael Ott's avatar Michael Ott
Browse files

Remove maxConnPerHost and maxConcRequests configuration parameters in Collect...

Remove  maxConnPerHost and maxConcRequests configuration parameters in Collect Agent as they have been deprecated in Cassandra
parent 71fb3f85
......@@ -411,7 +411,7 @@ int main(int argc, char* const argv[]) {
cassandraSettings.username, cassandraSettings.password);
dcdbConn->setNumThreadsIo(cassandraSettings.numThreadsIo);
dcdbConn->setQueueSizeIo(cassandraSettings.queueSizeIo);
uint32_t params[3] = {cassandraSettings.coreConnPerHost, cassandraSettings.maxConnPerHost, cassandraSettings.maxConcRequests};
uint32_t params[1] = {cassandraSettings.coreConnPerHost};
dcdbConn->setBackendParams(params);
if (!dcdbConn->connect()) {
......@@ -469,8 +469,6 @@ int main(int argc, char* const argv[]) {
LOG(info) << " NumThreadsIO: " << cassandraSettings.numThreadsIo;
LOG(info) << " QueueSizeIO: " << cassandraSettings.queueSizeIo;
LOG(info) << " CoreConnPerHost: " << cassandraSettings.coreConnPerHost;
LOG(info) << " MaxConnPerHost: " << cassandraSettings.maxConnPerHost;
LOG(info) << " MaxConcRequests: " << cassandraSettings.maxConcRequests;
LOG(info) << " DebugLog: " << (cassandraSettings.debugLog ? "Enabled" : "Disabled");
#ifdef SimpleMQTTVerbose
LOG(info) << " Username: " << cassandraSettings.username;
......
......@@ -38,8 +38,6 @@ cassandra {
numThreadsIo 1
queueSizeIo 4096
coreConnPerHost 1
maxConnPerHost 2
maxConcRequests 100
debugLog false
}
......@@ -42,10 +42,6 @@ void Configuration::readAdditionalBlocks(boost::property_tree::iptree& cfg) {
cassandraSettings.queueSizeIo = stoul(global.second.data());
} else if (boost::iequals(global.first, "coreConnPerHost")) {
cassandraSettings.coreConnPerHost = stoul(global.second.data());
} else if (boost::iequals(global.first, "maxConnPerHost")) {
cassandraSettings.maxConnPerHost = stoul(global.second.data());
} else if (boost::iequals(global.first, "maxConcRequests")) {
cassandraSettings.maxConcRequests = stoul(global.second.data());
} else if (boost::iequals(global.first, "debugLog")) {
cassandraSettings.debugLog = to_bool(global.second.data());
} else {
......
......@@ -32,8 +32,6 @@ public:
uint32_t numThreadsIo = 1;
uint32_t queueSizeIo = 4096;
uint32_t coreConnPerHost = 1;
uint32_t maxConnPerHost = 2;
uint32_t maxConcRequests = 100;
bool debugLog = false;
};
......
......@@ -313,8 +313,6 @@ void ConnectionImpl::setQueueSizeIo(uint32_t s) {
void ConnectionImpl::setBackendParams(uint32_t* p) {
if(!connected) {
coreConnPerHost = p[0];
maxConnPerHost = p[1];
maxConcRequests = p[2];
}
}
......@@ -373,8 +371,6 @@ bool ConnectionImpl::connect() {
cass_cluster_set_num_threads_io(cluster, numThreadsIo);
cass_cluster_set_queue_size_io(cluster, queueSizeIo);
cass_cluster_set_core_connections_per_host(cluster, coreConnPerHost);
cass_cluster_set_max_connections_per_host(cluster, maxConnPerHost);
cass_cluster_set_max_concurrent_requests_threshold(cluster, maxConcRequests);
/* Force protcol version to 1 */
cass_cluster_set_protocol_version(cluster, 1);
......@@ -539,8 +535,6 @@ ConnectionImpl::ConnectionImpl() {
numThreadsIo = 1;
queueSizeIo = 4096;
coreConnPerHost = 1;
maxConnPerHost = 2;
maxConcRequests = 100;
hostname_ = "localhost";
port_ = 9042;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment