From 635438599c4705cf3ab722955d20d8075aa9533f Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <43503225+pleblanc1976@users.noreply.github.com>
Date: Wed, 12 Feb 2020 08:51:23 -0600
Subject: [PATCH] Merge pull request #1042 from benthompson15/MCOL-3736
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MCOL-3736: Change AND to OR. Loop could exit with ops still in pendin…
---
 storage-manager/src/Synchronizer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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