database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-4770 Installation.PMwithUM is enabled by default so a plugin communicates with a local EM only

Browse Source 
Fix in DEC::Setup to allow to re-establish all PM connections in EM
This commit is contained in:
Roman Nozdrin
2021-06-23 10:38:46 +00:00
parent c6f4f00b0d
commit 14dbb6a8fb
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dbcon/joblist/distributedenginecomm.cpp
View File

@ -329,8 +329,11 @@ void DistributedEngineComm::Setup()
for (j = 0; j < pmCount; j++) for (j = 0; j < pmCount; j++)
{ {
if (newClients[i]->isSameAddr(*fPmConnections[j])) if (!fPmConnections.empty() && j < fPmConnections.size() &&
newClients[i]->isSameAddr(*fPmConnections[j]))
{
break; break;
}
} }
if (j == pmCount) if (j == pmCount)

2
dbcon/joblist/resourcemanager.cpp
View File

@ -171,6 +171,8 @@ ResourceManager::ResourceManager(bool runningInExeMgr) :
totalUmMemLimit = pmJoinMemLimit; totalUmMemLimit = pmJoinMemLimit;
else else
{ {
// Installation.PMwithUM = y by default so RM prefers HashJoin.TotalPmUmMemory
// if it exists.
string whichLimit = "TotalUmMemory"; string whichLimit = "TotalUmMemory";
string pmWithUM = fConfig->getConfig("Installation", "PMwithUM"); string pmWithUM = fConfig->getConfig("Installation", "PMwithUM");

2
oam/etc/Columnstore.xml
View File

@ -443,7 +443,7 @@
<InitialInstallFlag>y</InitialInstallFlag> <InitialInstallFlag>y</InitialInstallFlag>
<SingleServerInstall>y</SingleServerInstall> <SingleServerInstall>y</SingleServerInstall>
<ServerTypeInstall>2</ServerTypeInstall> <ServerTypeInstall>2</ServerTypeInstall>
<PMwithUM>n</PMwithUM> <PMwithUM>y</PMwithUM>
<MySQLRep>n</MySQLRep> <MySQLRep>n</MySQLRep>
<DBRootStorageType>internal</DBRootStorageType> <DBRootStorageType>internal</DBRootStorageType>
<UMStorageType>internal</UMStorageType> <UMStorageType>internal</UMStorageType>