Skip to content
This repository was archived by the owner on Dec 20, 2024. It is now read-only.

Commit 99626a4

Browse files
committed
bugfix: gc disk will produce error logs continuously when download home dir not exist
Signed-off-by: Starnop <[email protected]>
1 parent 78da1b6 commit 99626a4

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

supernode/daemon/mgr/cdn/cache_detector.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"github.com/dragonflyoss/Dragonfly/supernode/httpclient"
2525
"github.com/dragonflyoss/Dragonfly/supernode/store"
2626

27+
"github.com/pkg/errors"
2728
"github.com/sirupsen/logrus"
2829
)
2930

@@ -59,7 +60,7 @@ func (cd *cacheDetector) detectCache(ctx context.Context, task *types.TaskInfo)
5960

6061
if breakNum == 0 {
6162
if metaData, err = cd.resetRepo(ctx, task); err != nil {
62-
return 0, nil, err
63+
return 0, nil, errors.Wrapf(err, "failed to reset repo")
6364
}
6465
} else {
6566
logrus.Debugf("start to update access time with taskID(%s)", task.ID)
@@ -120,7 +121,7 @@ func (cd *cacheDetector) parseBreakNumByCheckFile(ctx context.Context, taskID st
120121
func (cd *cacheDetector) resetRepo(ctx context.Context, task *types.TaskInfo) (*fileMetaData, error) {
121122
logrus.Infof("reset repo for taskID: %s", task.ID)
122123
if err := deleteTaskFiles(ctx, cd.cacheStore, task.ID); err != nil {
123-
return nil, err
124+
logrus.Errorf("reset repo: failed to delete task(%s) files: %v", task.ID, err)
124125
}
125126

126127
return cd.metaDataManager.writeFileMetaDataByTask(ctx, task)

supernode/daemon/mgr/cdn/cdn_gc.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929

3030
"github.com/emirpasic/gods/maps/treemap"
3131
godsutils "github.com/emirpasic/gods/utils"
32+
"github.com/pkg/errors"
3233
"github.com/sirupsen/logrus"
3334
)
3435

@@ -41,7 +42,10 @@ func (cm *Manager) GetGCTaskIDs(ctx context.Context, taskMgr mgr.TaskMgr) ([]str
4142

4243
freeDisk, err := cm.cacheStore.GetAvailSpace(ctx, getHomeRawFunc())
4344
if err != nil {
44-
return nil, err
45+
if store.IsKeyNotFound(err) {
46+
return nil, nil
47+
}
48+
return nil, errors.Wrapf(err, "failed to get avail space")
4549
}
4650
if freeDisk > cm.cfg.YoungGCThreshold {
4751
return nil, nil

supernode/store/local_storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ func (ls *localStorage) statPath(bucket, key string) (string, os.FileInfo, error
309309
f, err := os.Stat(filePath)
310310
if err != nil {
311311
if os.IsNotExist(err) {
312-
return "", nil, errors.Wrapf(ErrKeyNotFound, "key: %s", key)
312+
return "", nil, errors.Wrapf(ErrKeyNotFound, "bucket(%s) key(%s)", bucket, key)
313313
}
314314
return "", nil, err
315315
}

0 commit comments

Comments
 (0)