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

chnages from 1.0.8

Browse Source
This commit is contained in:
David Hill
2017-03-27 16:39:35 -05:00
parent 61a7113eb0
commit 5000e79fdd
7 changed files with 165 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
oamapps/mcsadmin/mcsadmin.cpp
View File

@@ -719,11 +719,6 @@ int processCommand(string* arguments)
vector<uint32_t> srcDbroots; // all of the currently configured dbroots
vector<uint32_t> destDbroots; // srcDbroots - removeDbroots
set<int>::iterator dbiter;
if (!oam.checkSystemRunning())
{
cout << "Mariadb ColumnStore is not running" << endl;
break;
}
if (arguments[1] == "start")
{
// Get a list of all the configured dbroots in the xml file.
@@ -802,40 +797,6 @@ int processCommand(string* arguments)
cout << " " << *iter;
cout << endl << endl;
BRM::DBRM dbrm;
// Ready to start the redistribute. The system must SuspendDataBaseWrites for the duration.
if (dbrm.getSystemSuspended() == BRM::ERR_OK)
{
cout << "The system must be in read only mode for redistribeData to work" << endl;
cout << "You must run suspendDatabaseWrites before running redistributeData" << endl;
cout << "Be sure to run resumeDatabaseWrites when redistributeData status shows complete" << endl;
break;
}
#if 0
// This can be used when redistributeData doesn't return until complete.
if (dbrm.getSystemSuspended() == ERR_OK)
{
// System not in suspenddatabasewrites
// If there are bulkloads, ddl or dml happening, refuse the request
execplan::SessionManager sessionManager;
BRM::SIDTIDEntry blockingsid;
std::vector<BRM::TableLockInfo> tableLocks = dbrm.getAllTableLocks();
bool bActiveTransactions = false;
if (!tableLocks.empty())
{
cout << "There are active table locks. Redistribute won't run." << endl;
oam.DisplayLockedTables(tableLocks, &dbrm);
break;
}
else if (sessionManager.checkActiveTransaction(0, bIsDbrmUp, blockingsid))
{
cout << endl << "There are active transactions being processed. Redistribute won't run" << endl;
break;
}
}
// stop writes to MariaDB Columnstore Database
oam.SuspendWrites(gracefulTemp, ackTemp);
#endif
// Connect to PM for dbroot1
ByteStream bs;
// message WES ID, sequence #, action id
@@ -5046,13 +5007,13 @@ int processCommand(string* arguments)
cout << endl;
if ( rootUser)
{
system("rpm -qi mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
if (oam.checkLogStatus("/tmp/columnstore.txt", "Name"))
system("cat /tmp/columnstore.txt");
else {
system("dpkg -s mariadb-columnstore > /tmp/columnstore.txt 2>&1");
if (oam.checkLogStatus("/tmp/columnstore.txt", "Status: install"))
system("cat /tmp/columnstore.txt");
int rtnCode = system("rpm -qi mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
if (WEXITSTATUS(rtnCode) == 0)
system("cat /tmp/columnstore.txt");
else {
rtnCode = system("dpkg -s mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
if (WEXITSTATUS(rtnCode) == 0)
system("cat /tmp/columnstore.txt");
else {
SystemSoftware systemsoftware;
oam.getSystemSoftware(systemsoftware);