fix(cdn): select item inside at least n storage_unit (#5847)

ovh · Jun 15, 2021 · b746891 · b746891
1 parent 7f439a6
commit b746891
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/engine/cdn/cdn_gc_test.go b/engine/cdn/cdn_gc_test.go
@@ -324,7 +324,7 @@ func TestCleanSynchronizedItemWithDisabledStorage(t *testing.T) {
 
 	iusRedisAfter, err := storage.LoadItemUnitsByUnit(context.TODO(), s.Mapper, db, s.Units.LogsBuffer().ID(), &oneHundred)
 	require.NoError(t, err)
-	require.Equal(t, 2, len(iusRedisAfter))
+	require.Equal(t, 1, len(iusRedisAfter))
 
 	iusFS2After, err := storage.LoadItemUnitsByUnit(context.TODO(), s.Mapper, db, s.Units.Storages[0].ID(), &oneHundred)
 	require.NoError(t, err)

diff --git a/engine/cdn/storage/dao.go b/engine/cdn/storage/dao.go
@@ -149,7 +149,7 @@ func LoadAllSynchronizedItemIDs(db gorp.SqlExecutor, bufferUnitID string, maxSto
 	FROM storage_unit_item
 	WHERE item_id = ANY (select item_id from inBuffer)
 	GROUP BY item_id
-	HAVING COUNT(unit_id) = $1
+	HAVING COUNT(unit_id) >= $1
 	`
 	if _, err := db.Select(&itemIDs, query, maxStorageCount, bufferUnitID); err != nil {
 		return nil, sdk.WrapError(err, "unable to get item ids")