database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-1762 Keep Columnstore.xml settings

Browse Source 
This patch makes sure the following settings are retained during an
upgrade:

* ThreadPoolSize
* TLSCS
* TLSClientCert
* TLSClientKey
This commit is contained in:
Andrew Hutchings
2018-10-04 14:13:34 +01:00
parent c0600d0da0
commit 1ed5fdfc2b
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/configMgt/autoConfigure.cpp
View File

@ -516,6 +516,9 @@ int main(int argc, char* argv[])
string Port = "3306"; string Port = "3306";
string User = ""; string User = "";
string Password = ""; string Password = "";
string TLSCA = "";
string TLSClientCert = "";
string TLSClientKey = "";
try try
{ {
@ -542,6 +545,28 @@ int main(int argc, char* argv[])
catch (...) catch (...)
{} {}
try
{
TLSCA = sysConfigOld->getConfig("CrossEngineSupport", "TLSCA");
TLSClientCert = sysConfigOld->getConfig("CrossEngineSupport", "TLSClientCert");
TLSClientKey = sysConfigOld->getConfig("CrossEngineSupport", "TLSClientKey");
}
catch (...)
{
TLSCA = "";
TLSClientCert = "";
TLSClientKey = "";
}
try
{
sysConfigNew->setConfig("CrossEngineSupport", "TLSCA", TLSCA);
sysConfigNew->setConfig("CrossEngineSupport", "TLSClientCert", TLSClientCert);
sysConfigNew->setConfig("CrossEngineSupport", "TLSClientKey", TLSClientKey);
}
catch (...)
{}
//QueryStats and UserPriority //QueryStats and UserPriority
string QueryStats = "N"; string QueryStats = "N";
string UserPriority = "N"; string UserPriority = "N";
@ -2117,6 +2142,7 @@ int main(int argc, char* argv[])
string PrefetchThreshold; string PrefetchThreshold;
string MaxOutstandingRequests; string MaxOutstandingRequests;
string PmMaxMemorySmallSide; string PmMaxMemorySmallSide;
string ThreadPoolSize;
try try
{ {
@ -2124,6 +2150,7 @@ int main(int argc, char* argv[])
PrefetchThreshold = sysConfigOld->getConfig("PrimitiveServers", "PrefetchThreshold"); PrefetchThreshold = sysConfigOld->getConfig("PrimitiveServers", "PrefetchThreshold");
MaxOutstandingRequests = sysConfigOld->getConfig("JobList", "MaxOutstandingRequests"); MaxOutstandingRequests = sysConfigOld->getConfig("JobList", "MaxOutstandingRequests");
PmMaxMemorySmallSide = sysConfigOld->getConfig("HashJoin", "PmMaxMemorySmallSide"); PmMaxMemorySmallSide = sysConfigOld->getConfig("HashJoin", "PmMaxMemorySmallSide");
ThreadPoolSize = sysConfigOld->getConfig("JobList", "ThreadPoolSize");
} }
catch (...) catch (...)
{} {}
@ -2134,6 +2161,7 @@ int main(int argc, char* argv[])
sysConfigNew->setConfig("PrimitiveServers", "PrefetchThreshold", PrefetchThreshold); sysConfigNew->setConfig("PrimitiveServers", "PrefetchThreshold", PrefetchThreshold);
sysConfigNew->setConfig("JobList", "MaxOutstandingRequests", MaxOutstandingRequests); sysConfigNew->setConfig("JobList", "MaxOutstandingRequests", MaxOutstandingRequests);
sysConfigNew->setConfig("HashJoin", "PmMaxMemorySmallSide", PmMaxMemorySmallSide); sysConfigNew->setConfig("HashJoin", "PmMaxMemorySmallSide", PmMaxMemorySmallSide);
sysConfigNew->setConfig("JobList", "ThreadPoolSize", ThreadPoolSize);
} }
catch (...) catch (...)
{} {}