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-3608 Add module installer file copy

Browse Source 
Adds back some stuff that was remove distributed that didn't work
properly for non-distributed. Also use /var/lib/columnstore/local
for module file as OAM intended.
This commit is contained in:
Andrew Hutchings
2019-11-14 13:02:26 +00:00
parent 0621762378
commit 25d22381c6
8 changed files with 268 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
oam/oamcpp/oamcache.cpp
View File

@ -284,7 +284,7 @@ int OamCache::getLocalPMId()
{
mutex::scoped_lock lk(cacheLock);
// This comes from the file /etc/columnstore/module, not from the xml.
// This comes from the file /var/lib/columnstore/local/module, not from the xml.
// Thus, it's not refreshed during checkReload().
if (mLocalPMId > 0)
{
@ -293,7 +293,7 @@ int OamCache::getLocalPMId()
string localModule;
string moduleType;
string fileName = "/etc/columnstore/module";
string fileName = "/var/lib/columnstore/local/module";
ifstream moduleFile (fileName.c_str());
char line[400];
@ -337,7 +337,7 @@ string OamCache::getModuleName()
if (!moduleName.empty())
return moduleName;
string fileName = "/etc/columnstore/module";
string fileName = "/var/lib/columnstore/local/module";
ifstream moduleFile(fileName.c_str());
getline(moduleFile, moduleName);
moduleFile.close();