database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-18 13:54:11 +03:00
Code Activity

Fixed the deadlock in our sanity check code in synchronizer.

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-05-28 10:51:15 -05:00
parent 9a1dc8a4c5
commit b9d7a2e4c4
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Synchronizer.cpp
View File

@@ -131,8 +131,9 @@ void Synchronizer::flushObject(const string &key)
// if there is something to do on key, it should be either in pendingOps or opsInProgress // if there is something to do on key, it should be either in pendingOps or opsInProgress
// if it is is pending ops, start the job now. If it is in progress, wait for it to finish. // if it is is pending ops, start the job now. If it is in progress, wait for it to finish.
// The sanity check at the end was intended for debugging / development // If there are no jobs to do on key, it will verify it exists in cloud storage.
// I'm inclined to make it permanent. An existence check on S3 is quick. // The existence check is currently necessary on a startup where the cache is populated but
// synchronizer isn't.
bool noExistingJob = false; bool noExistingJob = false;
auto it = pendingOps.find(key); auto it = pendingOps.find(key);
@@ -182,7 +183,9 @@ void Synchronizer::flushObject(const string &key)
"and there is no job for it. Merging & uploading now.", key.c_str()); "and there is no job for it. Merging & uploading now.", key.c_str());
pendingOps[key] = boost::shared_ptr<PendingOps>(new PendingOps(JOURNAL)); pendingOps[key] = boost::shared_ptr<PendingOps>(new PendingOps(JOURNAL));
objNames.push_front(key); objNames.push_front(key);
process(objNames.begin()); auto nameIt = objNames.begin();
s.unlock();
process(nameIt);
} }
else if (!keyExists) else if (!keyExists)
{ {
@@ -190,7 +193,9 @@ void Synchronizer::flushObject(const string &key)
"and there is no job for it. Uploading it now.", key.c_str()); "and there is no job for it. Uploading it now.", key.c_str());
pendingOps[key] = boost::shared_ptr<PendingOps>(new PendingOps(NEW_OBJECT)); pendingOps[key] = boost::shared_ptr<PendingOps>(new PendingOps(NEW_OBJECT));
objNames.push_front(key); objNames.push_front(key);
process(objNames.begin()); auto nameIt = objNames.begin();
s.unlock();
process(nameIt);
} }
} }