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

Fixed up the Sync unit test, fixed a couple things in S3Storage,

Browse Source 
it's working now.
This commit is contained in:
Patrick LeBlanc
2019-03-26 15:58:22 -05:00
parent de1d849d14
commit ed6caeb830
5 changed files with 126 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Synchronizer.cpp
View File

@@ -277,6 +277,8 @@ void Synchronizer::process(list<string>::iterator name, bool callerHoldsLock)
mutex.unlock();
bool success = false;
// in testing, this seems to only run once when an exception is caught. Not obvious why yet.... ??
while (!success)
{
try {
@@ -296,6 +298,7 @@ void Synchronizer::process(list<string>::iterator name, bool callerHoldsLock)
catch(exception &e) {
logger->log(LOG_CRIT, "Synchronizer::process(): error sync'ing %s opFlags=%d, got '%s'. Retrying...", key.c_str(),
pending->opFlags, e.what());
success = false;
sleep(1);
// TODO: requeue the job instead of looping infinitely
}
@@ -419,8 +422,10 @@ void Synchronizer::synchronizeWithJournal(const string &sourceFile, list<string>
}
// update the metadata for the source file
MetadataFile md(sourceFile.c_str());
// note: a temporary fix. Metadatafile needs the full path to the metadata atm. Fix this
// once MDF knows where to look.
string metaPrefix = Config::get()->getValue("ObjectStorage", "metadata_path");
MetadataFile md((metaPrefix + "/" + sourceFile).c_str());
md.updateEntry(MetadataFile::getOffsetFromKey(key), newKey, size);
replicator->updateMetadata(sourceFile.c_str(), md);