fix upload status issue

src/python/dm/common/constants/dmProcessingStatus.py

@@ -34,5 +34,6 @@ DM_INACTIVE_PROCESSING_STATUS_LIST = [
 DM_ACTIVE_PROCESSING_STATUS_LIST = [
     DM_PROCESSING_STATUS_PENDING,
     DM_PROCESSING_STATUS_RUNNING,
+    DM_PROCESSING_STATUS_FINALIZING,
     DM_PROCESSING_STATUS_ABORTING
 ]

src/python/dm/common/objects/daqInfo.py

@@ -78,7 +78,7 @@ class DaqInfo(DmObject):
 
         if self.get('endTime'):
             daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_FINALIZING
-            if nCompletedFiles == nFiles:
+            if nCompletedFiles >= nFiles:
                 daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_DONE
                 if nProcessingErrors:
                     daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_FAILED

src/python/dm/common/objects/uploadInfo.py

@@ -73,7 +73,7 @@ class UploadInfo(DmObject):
         startTime = self.get('startTime', now)
         runTime = now - startTime
         endTime = None
-        if nCompletedFiles == nFiles:
+        if nCompletedFiles == nFiles and uploadStatus != dmProcessingStatus.DM_PROCESSING_STATUS_PENDING:
             uploadStatus = 'done'
             if nProcessingErrors:
                 uploadStatus = 'failed'
@@ -84,7 +84,7 @@ class UploadInfo(DmObject):
                 endTime = lastFileProcessingErrorTime
 
         if nCancelledFiles > 0 and nCancelledFiles+nCompletedFiles == nFiles:
-            uploadStatus = 'aborted'
+            uploadStatus = dmProcessingStatus.DM_PROCESSING_STATUS_ABORTED
             endTime = self.get('lastFileProcessingCancelledTime', now)
 
         if endTime:

src/python/dm/common/processing/plugins/mongoDbFileCatalogPlugin.py

@@ -2,6 +2,7 @@
 
 import os
 import time
+from dm.common.constants import dmProcessingStatus
 from dm.common.utility.loggingManager import LoggingManager
 from dm.common.objects.observedFile import ObservedFile
 from dm.common.utility.timeUtility import TimeUtility
@@ -123,7 +124,7 @@ class MongoDbFileCatalogPlugin(FileProcessor):
             fileInfo['daqInfo'] = daqInfo
             fileInfo['uploadId'] = uploadId
 
-            if uploadInfo.get('status') != 'aborting':
+            if uploadInfo.get('status') != dmProcessingStatus.DM_PROCESSING_STATUS_ABORTING:
                 self.processFile(fileInfo)
                 nProcessedFiles += 1
             else:

src/python/dm/daq_web_service/service/impl/uploadTracker.py

@@ -25,7 +25,7 @@ class UploadTracker(ObjectTracker):
             uploadInfo = self.get(uploadId)
             if uploadInfo is not None:
                 uploadInfo.updateStatus()
-                if uploadInfo.get('status') == dmProcessingStatus.DM_PROCESSING_STATUS_RUNNING:
+                if uploadInfo.get('status') in dmProcessingStatus.DM_ACTIVE_PROCESSING_STATUS_LIST:
                     raise ObjectAlreadyExists('Upload id %s is already active for experiment %s in data directory %s.' % (uploadId, experimentName, dataDir))
                 del self.activeUploadDict[activeUploadKey]