fix: use getTask instead of taskStore.Get, for the error cause type (#…

…571) Signed-off-by: zzy987 <67889264+zzy987@users.noreply.github.com>
dragonflyoss · Aug 24, 2021 · 64e83a9 · 64e83a9
1 parent f180bd1
commit 64e83a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/cdnsystem/supervisor/cdn/storage/storage_gc.go b/cdnsystem/supervisor/cdn/storage/storage_gc.go
@@ -100,10 +100,7 @@ func (cleaner *Cleaner) GC(storagePattern string, force bool) ([]string, error)
 		walkTaskIds[taskID] = true
 
 		// we should return directly when we success to get info which means it is being used
-		if _, err := cleaner.taskMgr.Get(taskID); err == nil || !cdnerrors.IsDataNotFound(err) {
-			if err != nil {
-				logger.GcLogger.With("type", storagePattern).Errorf("failed to get taskID(%s): %v", taskID, err)
-			}
+		if cleaner.taskMgr.Exist(taskID) {
 			return nil
 		}
 

diff --git a/cdnsystem/supervisor/task/manager.go b/cdnsystem/supervisor/task/manager.go
@@ -182,7 +182,7 @@ func (tm Manager) Get(taskID string) (*types.SeedTask, error) {
 }
 
 func (tm Manager) Exist(taskID string) bool {
-	_, err := tm.taskStore.Get(taskID)
+	_, err := tm.getTask(taskID)
 	return err == nil || !cdnerrors.IsDataNotFound(err)
 }