Queue fix

opendm/remote.py

@@ -329,7 +329,7 @@ class Task:
                     if info.status == TaskStatus.QUEUED:
                         log.ODM_WARNING("LRE: %s (%s) turned from RUNNING to QUEUED. Re-adding to back of the queue." % (self, task.uuid))
                         task.remove()
-                        done(NodeTaskLimitReachedException("Delayed task limit reached"), partial=True)
+                        raise NodeTaskLimitReachedException("Delayed task limit reached")
                     elif info.status == TaskStatus.RUNNING:
                         # Print a status message once in a while
                         nonloc.status_callback_calls += 1

stages/splitmerge.py

@@ -31,6 +31,9 @@ class ODMSplitStage(types.ODM_Stage):
             split_done_file = octx.path("split_done.txt")
 
             if not io.file_exists(split_done_file) or self.rerun():
+                if not local_workflow:
+                    args.max_concurrency = max(1, args.max_concurrency - 1)
+                    log.ODM_INFO("Setting max-concurrency to %s to better handle remote splits" % args.max_concurrency)
 
                 log.ODM_INFO("Large dataset detected (%s photos) and split set at %s. Preparing split merge." % (len(photos), args.split))
                 config = [