feat(store): put minerid to context

ipfs-force-community · Sep 5, 2023 · ae01f5e · ae01f5e
1 parent d7c5033
commit ae01f5e
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 10 deletions.
diff --git a/damocles-manager/core/api.go b/damocles-manager/core/api.go
@@ -84,7 +84,7 @@ type SealerAPI interface {
 	AchieveUnsealSector(ctx context.Context, sid abi.SectorID, pieceCid cid.Cid, errInfo string) (Meta, error)
 	AcquireUnsealDest(ctx context.Context, sid abi.SectorID, pieceCid cid.Cid) ([]string, error)
 
-	StoreUri(ctx context.Context, storeName string, resource string) (string, error)
+	StoreUri(ctx context.Context, storeName, resource string, minerID uint64) (string, error)
 }
 
 type SealerCliAPI interface {

diff --git a/damocles-manager/go.mod b/damocles-manager/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230901024916-a92456f84db2
+	github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230905053730-d7c5033eb6eb
 	github.com/ipfs-force-community/venus-cluster-assets v0.1.0
 	github.com/ipfs/boxo v0.10.1
 	github.com/ipfs/go-cid v0.4.1

diff --git a/damocles-manager/go.sum b/damocles-manager/go.sum
@@ -572,8 +572,8 @@ github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6 h1:8UsGZ2rr2ksmEru6lTo
 github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6/go.mod h1:xQig96I1VNBDIWGCdTt54nHt6EeI639SmHycLYL7FkA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230901024916-a92456f84db2 h1:iarakGdwdvuaGJv8cbV3NHv7RseaeuDD/PzPoeajy60=
-github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230901024916-a92456f84db2/go.mod h1:me1u2cl7qdxBCZiVL0laDop8uBHDdUwlUNnQ7KkHF64=
+github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230905053730-d7c5033eb6eb h1:GPWQEuzTnwDjaTeZxzM9sxsMFiHGA10jR3ZNNOoZOnA=
+github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230905053730-d7c5033eb6eb/go.mod h1:EpGeK7b251iv7L5TnHl1PJGFH4KbliE03ctYt5thy6c=
 github.com/ipfs-force-community/go-jsonrpc v0.1.7-0.20230220074347-8db78dbc20d4 h1:iu/3irYevdNpdc0B/gRi1vuS3+lRn+6Ro9G0FeBiAfE=
 github.com/ipfs-force-community/go-jsonrpc v0.1.7-0.20230220074347-8db78dbc20d4/go.mod h1:jBSvPTl8V1N7gSTuCR4bis8wnQnIjHbRPpROol6iQKM=
 github.com/ipfs-force-community/venus-cluster-assets v0.1.0 h1:K/0+OV9Jm7HjSa7O9MAtgfLDIudQYZUTymhJsp8rGXg=

diff --git a/damocles-manager/modules/impl/mock/sealer.go b/damocles-manager/modules/impl/mock/sealer.go
@@ -20,6 +20,7 @@ import (
 	chainAPI "github.com/ipfs-force-community/damocles/damocles-manager/pkg/chain"
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
 	"github.com/ipfs-force-community/damocles/damocles-manager/ver"
+	storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
 )
 
 var _ core.SealerAPI = (*Sealer)(nil)
@@ -320,7 +321,10 @@ func (s *Sealer) Version(context.Context) (string, error) {
 	return ver.VersionStr(), nil
 }
 
-func (s *Sealer) StoreUri(ctx context.Context, storeName string, resource string) (string, error) {
+func (s *Sealer) StoreUri(ctx context.Context, storeName, resource string, minerID uint64) (string, error) {
+	ctx = storeMiner.NewContext(ctx, &storeMiner.MinerMeta{
+		ID: minerID,
+	})
 	store, err := s.persistedStoreManager.GetInstance(ctx, storeName)
 	if err != nil {
 		return "", err

diff --git a/damocles-manager/modules/impl/sectors/proving.go b/damocles-manager/modules/impl/sectors/proving.go
@@ -15,6 +15,7 @@ import (
 	"github.com/ipfs-force-community/damocles/damocles-manager/modules"
 	chainAPI "github.com/ipfs-force-community/damocles/damocles-manager/pkg/chain"
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
+	storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
 	"github.com/ipfs/go-cid"
 )
 
@@ -45,6 +46,9 @@ type Proving struct {
 }
 
 func (p *Proving) SingleProvable(ctx context.Context, postProofType abi.RegisteredPoStProof, sref core.SectorRef, upgrade bool, locator core.SectorLocator, strict, stateCheck bool) error {
+	ctx = storeMiner.NewContext(ctx, &storeMiner.MinerMeta{
+		ID: uint64(sref.ID.Miner),
+	})
 	ssize, err := sref.ProofType.SectorSize()
 	if err != nil {
 		return fmt.Errorf("get sector size: %w", err)

diff --git a/damocles-manager/modules/impl/sectors/snapup_commit.go b/damocles-manager/modules/impl/sectors/snapup_commit.go
@@ -27,6 +27,7 @@ import (
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/chain"
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/messager"
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
+	storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
 )
 
 func NewSnapUpCommitter(
@@ -591,8 +592,10 @@ func (h *snapupCommitHandler) cleanupForSector() error {
 		ID:        h.state.ID,
 		ProofType: h.state.SectorType,
 	}
-
-	privateInfo, err := h.committer.tracker.SinglePrivateInfo(h.committer.ctx, sref, false, nil)
+	ctx := storeMiner.NewContext(h.committer.ctx, &storeMiner.MinerMeta{
+		ID: uint64(sref.ID.Miner),
+	})
+	privateInfo, err := h.committer.tracker.SinglePrivateInfo(ctx, sref, false, nil)
 	if err != nil {
 		return fmt.Errorf("get private info from tracker: %w", err)
 	}
@@ -613,7 +616,7 @@ func (h *snapupCommitHandler) cleanupForSector() error {
 
 	for ti := range cleanupTargets {
 		storeInstance := cleanupTargets[ti].storeInstance
-		store, err := h.committer.indexer.StoreMgr().GetInstance(h.committer.ctx, storeInstance)
+		store, err := h.committer.indexer.StoreMgr().GetInstance(ctx, storeInstance)
 		if err != nil {
 			return fmt.Errorf("get store instance %s: %w", storeInstance, err)
 		}
@@ -623,7 +626,7 @@ func (h *snapupCommitHandler) cleanupForSector() error {
 		for fi := range fileURIs {
 			uri := fileURIs[fi]
 			errwg.Go(func() error {
-				delErr := store.Del(h.committer.ctx, uri)
+				delErr := store.Del(ctx, uri)
 				if delErr == nil {
 					log.Debugf("CC data cleaned: %s, store: %s", uri, storeInstance)
 					return nil

diff --git a/damocles-manager/modules/impl/sectors/tracker.go b/damocles-manager/modules/impl/sectors/tracker.go
@@ -11,6 +11,7 @@ import (
 	"github.com/ipfs-force-community/damocles/damocles-manager/core"
 	"github.com/ipfs-force-community/damocles/damocles-manager/modules/util"
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
+	storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
 )
 
 var _ core.SectorTracker = (*Tracker)(nil)
@@ -41,6 +42,9 @@ func (t *Tracker) SinglePubToPrivateInfo(ctx context.Context, mid abi.ActorID, s
 }
 
 func (t *Tracker) getPrivateInfo(ctx context.Context, sref core.SectorRef, upgrade bool, locator core.SectorLocator) (*sectorStoreInstances, core.PrivateSectorInfo, error) {
+	ctx = storeMiner.NewContext(ctx, &storeMiner.MinerMeta{
+		ID: uint64(sref.ID.Miner),
+	})
 	objins, err := t.getObjInstanceForSector(ctx, sref.ID, locator, upgrade)
 	if err != nil {
 		return nil, core.PrivateSectorInfo{}, fmt.Errorf("get location for %s: %w", util.FormatSectorID(sref.ID), err)

diff --git a/damocles-manager/modules/sealer/sealer.go b/damocles-manager/modules/sealer/sealer.go
@@ -24,6 +24,7 @@ import (
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/logging"
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/piecestore"
+	storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
 )
 
 var (
@@ -834,7 +835,10 @@ func (s *Sealer) AcquireUnsealDest(ctx context.Context, sid abi.SectorID, pieceC
 	return s.unseal.AcquireDest(ctx, sid, pieceCid)
 }
 
-func (s *Sealer) StoreUri(ctx context.Context, storeName string, resource string) (string, error) {
+func (s *Sealer) StoreUri(ctx context.Context, storeName, resource string, minerID uint64) (string, error) {
+	ctx = storeMiner.NewContext(ctx, &storeMiner.MinerMeta{
+		ID: minerID,
+	})
 	store, err := s.sectorIdxer.StoreMgr().GetInstance(ctx, storeName)
 	if err != nil {
 		return "", err

diff --git a/damocles-manager/modules/sealer/sealer_cli.go b/damocles-manager/modules/sealer/sealer_cli.go
@@ -25,6 +25,7 @@ import (
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/kvstore"
 	"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
 	"github.com/ipfs-force-community/damocles/damocles-manager/ver"
+	storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
 )
 
 func (s *Sealer) ListSectors(ctx context.Context, ws core.SectorWorkerState, job core.SectorWorkerJob) ([]*core.SectorState, error) {
@@ -225,6 +226,10 @@ func (s *Sealer) RemoveSector(ctx context.Context, sid abi.SectorID) error {
 		}
 	}
 
+	ctx = storeMiner.NewContext(ctx, &storeMiner.MinerMeta{
+		ID: uint64(sid.Miner),
+	})
+
 	dest := s.sectorIdxer.Normal()
 	if state.Upgraded {
 		dest = s.sectorIdxer.Upgrade()