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

handle glusterAssign/glusterUnassign in cases where device is already mounted or not mounted yet

Browse Source
This commit is contained in:
Ben Thompson
2017-08-03 11:01:47 -05:00
parent 338b037c95
commit 90a04235eb
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
procmon/processmonitor.cpp
View File

@ -6106,14 +6106,24 @@ int ProcessMonitor::glusterAssign(std::string dbrootID)
moduleIPAddr = sysConfig->getConfig("SystemModuleConfig",dataDupIPaddr); moduleIPAddr = sysConfig->getConfig("SystemModuleConfig",dataDupIPaddr);
} }
string command = "mount -tglusterfs -odirect-io-mode=enable " + moduleIPAddr + ":/dbroot" + string command = "mount -tglusterfs -odirect-io-mode=enable " + moduleIPAddr + ":/dbroot" +
dbrootID + " " + startup::StartUp::installDir() + "/data" + dbrootID +""; dbrootID + " " + startup::StartUp::installDir() + "/data" + dbrootID + " > /tmp/glusterAssign.txt 2>&1";
int ret = system(command.c_str()); int ret = system(command.c_str());
if ( WEXITSTATUS(ret) != 0 ) if ( WEXITSTATUS(ret) != 0 )
{ {
ifstream in("/tmp/glusterAssign.txt");
in.seekg(0, std::ios::end);
int size = in.tellg();
if ( size != 0 )
{
if (!oam.checkLogStatus("/tmp/glusterAssign.txt", "already")) {
log.writeLog(__LINE__, "glusterAssign failed.", LOG_TYPE_ERROR); log.writeLog(__LINE__, "glusterAssign failed.", LOG_TYPE_ERROR);
system("mv -f /tmp/glusterAssign.txt /tmp/glusterAssign_failed.txt");
return oam::API_FAILURE; return oam::API_FAILURE;
} }
}
}
return oam::API_SUCCESS; return oam::API_SUCCESS;
@ -6134,11 +6144,22 @@ int ProcessMonitor::glusterUnassign(std::string dbrootID)
log.writeLog(__LINE__, "glusterUnassign called: " + dbrootID, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "glusterUnassign called: " + dbrootID, LOG_TYPE_DEBUG);
string command = "umount -f " + startup::StartUp::installDir() + "/dbroot" + dbrootID + ""; string command = "umount -f " + startup::StartUp::installDir() + "/data" + dbrootID + " > /tmp/glusterUnassign.txt 2>&1";
int ret = system(command.c_str()); int ret = system(command.c_str());
if ( WEXITSTATUS(ret) != 0 ) if ( WEXITSTATUS(ret) != 0 )
{ {
ifstream in("/tmp/glusterUnassign.txt");
in.seekg(0, std::ios::end);
int size = in.tellg();
if ( size != 0 )
{
if (!oam.checkLogStatus("/tmp/glusterAssign.txt", "not mounted")) {
log.writeLog(__LINE__, "glusterUnassign failed.", LOG_TYPE_ERROR);
system("mv -f /tmp/glusterUnassign.txt /tmp/glusterUnassign_failed.txt");
return oam::API_FAILURE;
}
}
log.writeLog(__LINE__, "glusterUnassign failed.", LOG_TYPE_ERROR); log.writeLog(__LINE__, "glusterUnassign failed.", LOG_TYPE_ERROR);
return oam::API_FAILURE; return oam::API_FAILURE;
} }