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-455: fix crash caused by rewind of unopened redistribute plan file during display when no partitions have been planned to be moved.

Browse Source
This commit is contained in:
David Hall
2017-01-20 10:10:24 -06:00
parent 8f2bfb58de
commit 72436e1d57
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
writeengine/redistribute/we_redistributecontrolthread.cpp
View File

@ -316,7 +316,7 @@ int RedistributeControlThread::makeRedistributePlan()
targetDbroots.insert(*j); targetDbroots.insert(*j);
} }
} }
// At this point, there are two concepts of target. (1)Those fTargetSet, which is the // At this point, there are two concepts of target. (1)Those in fTargetSet, which is the
// set of dbroots the user wants partitions on and (2) those in targetDbroots, a subset of // set of dbroots the user wants partitions on and (2) those in targetDbroots, a subset of
// fTargetSet, which is those that actually have room, based on average, for more data. // fTargetSet, which is those that actually have room, based on average, for more data.
@ -423,6 +423,7 @@ int RedistributeControlThread::makeRedistributePlan()
if (dbPartVec[*targetDbroot].size() < partCount) if (dbPartVec[*targetDbroot].size() < partCount)
{ {
tdbroot = *targetDbroot; tdbroot = *targetDbroot;
partCount = dbPartVec[*targetDbroot].size();
} }
} }
if (tdbroot == 0) if (tdbroot == 0)
@ -495,15 +496,22 @@ void RedistributeControlThread::dumpPlanToFile(uint64_t oid, vector<PartitionInf
void RedistributeControlThread::displayPlan() void RedistributeControlThread::displayPlan()
{ {
// start from the first entry // start from the first entry
rewind(fControl->fPlanFilePtr); try
ByteStream bs;
uint32_t entryId = 0;
long entrySize = sizeof(RedistributePlanEntry);
fControl->logMessage(string("Redistribution Plan:"));
while (entryId++ < fEntryCount)
{ {
try if (!fControl->fPlanFilePtr)
{
ostringstream oss;
oss << "No data is schefuled to be moved" << endl;
fControl->logMessage(oss.str());
return;
}
rewind(fControl->fPlanFilePtr);
ByteStream bs;
uint32_t entryId = 0;
long entrySize = sizeof(RedistributePlanEntry);
fControl->logMessage(string("Redistribution Plan:"));
while (entryId++ < fEntryCount)
{ {
RedistributePlanEntry entry; RedistributePlanEntry entry;
errno = 0; errno = 0;
@ -522,14 +530,18 @@ void RedistributeControlThread::displayPlan()
<< " moves from dbroot " << entry.source << " to " << entry.destination << endl; << " moves from dbroot " << entry.source << " to " << entry.destination << endl;
fControl->logMessage(oss.str()); fControl->logMessage(oss.str());
} }
catch (std::exception &e) }
{ catch (std::exception &e)
cout << "exception during display of plan: " << e.what() << endl; {
} ostringstream oss;
catch (...) oss << "exception during display of plan: " << e.what() << endl;
{ fControl->logMessage(oss.str());
cout << "exception during display of plan" << endl; }
} catch (...)
{
ostringstream oss;
oss << "exception during display of plan" << endl;
fControl->logMessage(oss.str());
} }
} }