database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge pull request #1042 from benthompson15/MCOL-3736

Browse Source 
MCOL-3736: Change AND to OR. Loop could exit with ops still in pendin…
This commit is contained in:
Patrick LeBlanc
2020-02-12 08:51:23 -06:00
committed by Patrick LeBlanc
parent e0cb60dcd2
commit 635438599c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage-manager/src/Synchronizer.cpp
View File

@ -305,7 +305,7 @@ void Synchronizer::syncNow(const bf::path &prefix)
// this should be redone to only remove items of given prefix eventually // this should be redone to only remove items of given prefix eventually
blockNewJobs = true; blockNewJobs = true;
while (pendingOps.size() != 0 && opsInProgress.size() != 0) while (pendingOps.size() != 0 || opsInProgress.size() != 0)
{ {
for (auto &job : pendingOps) for (auto &job : pendingOps)
makeJob(job.first); makeJob(job.first);
@ -329,7 +329,7 @@ void Synchronizer::syncNow()
// Leaving S3 storage and local metadata directories sync'd for snapshot backups. // Leaving S3 storage and local metadata directories sync'd for snapshot backups.
blockNewJobs = true; blockNewJobs = true;
while (pendingOps.size() != 0 && opsInProgress.size() != 0) while (pendingOps.size() != 0 || opsInProgress.size() != 0)
{ {
for (auto &job : pendingOps) for (auto &job : pendingOps)
makeJob(job.first); makeJob(job.first);