Merge remote-tracking branch 'origin/master' into feat/worker-task-co…

…unt-limits
filecoin-project · May 25, 2022 · 2bdc729 · 2bdc729
2 parents b90b9e9 + 6f2c8d6
commit 2bdc729
Show file tree

Hide file tree

Showing 49 changed files with 1,964 additions and 1,075 deletions.
diff --git a/.github/workflows/testground-on-push.yml b/.github/workflows/testground-on-push.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: testground run
-        uses: coryschwartz/testground-github-action@v1.1
+        uses: testground/testground-github-action@v1
         with:
           backend_addr: ${{ matrix.backend_addr }}
           backend_proto: ${{ matrix.backend_proto }}

diff --git a/api/api_storage.go b/api/api_storage.go
@@ -227,6 +227,9 @@ type StorageMiner interface {
 	// DagstoreGC runs garbage collection on the DAG store.
 	DagstoreGC(ctx context.Context) ([]DagstoreShardResult, error) //perm:admin
 
+	// DagstoreRegisterShard registers a shard manually with dagstore with given pieceCID
+	DagstoreRegisterShard(ctx context.Context, key string) error //perm:admin
+
 	// IndexerAnnounceDeal informs indexer nodes that a new deal was received,
 	// so they can download its index
 	IndexerAnnounceDeal(ctx context.Context, proposalCid cid.Cid) error //perm:admin