Skip to content

Commit ae01f5e

Browse files
0x54590x5459
committed
feat(store): put minerid to context
1 parent d7c5033 commit ae01f5e

File tree

9 files changed

+34
-10
lines changed

9 files changed

+34
-10
lines changed

‎damocles-manager/core/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ type SealerAPI interface {
8484
AchieveUnsealSector(ctx context.Context, sid abi.SectorID, pieceCid cid.Cid, errInfo string) (Meta, error)
8585
AcquireUnsealDest(ctx context.Context, sid abi.SectorID, pieceCid cid.Cid) ([]string, error)
8686

87-
StoreUri(ctx context.Context, storeName string, resource string) (string, error)
87+
StoreUri(ctx context.Context, storeName, resource string, minerID uint64) (string, error)
8888
}
8989

9090
type SealerCliAPI interface {

‎damocles-manager/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/golang/mock v1.6.0
2828
github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026
2929
github.com/hashicorp/go-multierror v1.1.1
30-
github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230901024916-a92456f84db2
30+
github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230905053730-d7c5033eb6eb
3131
github.com/ipfs-force-community/venus-cluster-assets v0.1.0
3232
github.com/ipfs/boxo v0.10.1
3333
github.com/ipfs/go-cid v0.4.1

‎damocles-manager/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6 h1:8UsGZ2rr2ksmEru6lTo
572572
github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6/go.mod h1:xQig96I1VNBDIWGCdTt54nHt6EeI639SmHycLYL7FkA=
573573
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
574574
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
575-
github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230901024916-a92456f84db2 h1:iarakGdwdvuaGJv8cbV3NHv7RseaeuDD/PzPoeajy60=
576-
github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230901024916-a92456f84db2/go.mod h1:me1u2cl7qdxBCZiVL0laDop8uBHDdUwlUNnQ7KkHF64=
575+
github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230905053730-d7c5033eb6eb h1:GPWQEuzTnwDjaTeZxzM9sxsMFiHGA10jR3ZNNOoZOnA=
576+
github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20230905053730-d7c5033eb6eb/go.mod h1:EpGeK7b251iv7L5TnHl1PJGFH4KbliE03ctYt5thy6c=
577577
github.com/ipfs-force-community/go-jsonrpc v0.1.7-0.20230220074347-8db78dbc20d4 h1:iu/3irYevdNpdc0B/gRi1vuS3+lRn+6Ro9G0FeBiAfE=
578578
github.com/ipfs-force-community/go-jsonrpc v0.1.7-0.20230220074347-8db78dbc20d4/go.mod h1:jBSvPTl8V1N7gSTuCR4bis8wnQnIjHbRPpROol6iQKM=
579579
github.com/ipfs-force-community/venus-cluster-assets v0.1.0 h1:K/0+OV9Jm7HjSa7O9MAtgfLDIudQYZUTymhJsp8rGXg=

‎damocles-manager/modules/impl/mock/sealer.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
chainAPI "github.com/ipfs-force-community/damocles/damocles-manager/pkg/chain"
2121
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
2222
"github.com/ipfs-force-community/damocles/damocles-manager/ver"
23+
storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
2324
)
2425

2526
var _ core.SealerAPI = (*Sealer)(nil)
@@ -320,7 +321,10 @@ func (s *Sealer) Version(context.Context) (string, error) {
320321
return ver.VersionStr(), nil
321322
}
322323

323-
func (s *Sealer) StoreUri(ctx context.Context, storeName string, resource string) (string, error) {
324+
func (s *Sealer) StoreUri(ctx context.Context, storeName, resource string, minerID uint64) (string, error) {
325+
ctx = storeMiner.NewContext(ctx, &storeMiner.MinerMeta{
326+
ID: minerID,
327+
})
324328
store, err := s.persistedStoreManager.GetInstance(ctx, storeName)
325329
if err != nil {
326330
return "", err

‎damocles-manager/modules/impl/sectors/proving.go

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/ipfs-force-community/damocles/damocles-manager/modules"
1616
chainAPI "github.com/ipfs-force-community/damocles/damocles-manager/pkg/chain"
1717
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
18+
storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
1819
"github.com/ipfs/go-cid"
1920
)
2021

@@ -45,6 +46,9 @@ type Proving struct {
4546
}
4647

4748
func (p *Proving) SingleProvable(ctx context.Context, postProofType abi.RegisteredPoStProof, sref core.SectorRef, upgrade bool, locator core.SectorLocator, strict, stateCheck bool) error {
49+
ctx = storeMiner.NewContext(ctx, &storeMiner.MinerMeta{
50+
ID: uint64(sref.ID.Miner),
51+
})
4852
ssize, err := sref.ProofType.SectorSize()
4953
if err != nil {
5054
return fmt.Errorf("get sector size: %w", err)

‎damocles-manager/modules/impl/sectors/snapup_commit.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/chain"
2828
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/messager"
2929
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
30+
storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
3031
)
3132

3233
func NewSnapUpCommitter(
@@ -591,8 +592,10 @@ func (h *snapupCommitHandler) cleanupForSector() error {
591592
ID: h.state.ID,
592593
ProofType: h.state.SectorType,
593594
}
594-
595-
privateInfo, err := h.committer.tracker.SinglePrivateInfo(h.committer.ctx, sref, false, nil)
595+
ctx := storeMiner.NewContext(h.committer.ctx, &storeMiner.MinerMeta{
596+
ID: uint64(sref.ID.Miner),
597+
})
598+
privateInfo, err := h.committer.tracker.SinglePrivateInfo(ctx, sref, false, nil)
596599
if err != nil {
597600
return fmt.Errorf("get private info from tracker: %w", err)
598601
}
@@ -613,7 +616,7 @@ func (h *snapupCommitHandler) cleanupForSector() error {
613616

614617
for ti := range cleanupTargets {
615618
storeInstance := cleanupTargets[ti].storeInstance
616-
store, err := h.committer.indexer.StoreMgr().GetInstance(h.committer.ctx, storeInstance)
619+
store, err := h.committer.indexer.StoreMgr().GetInstance(ctx, storeInstance)
617620
if err != nil {
618621
return fmt.Errorf("get store instance %s: %w", storeInstance, err)
619622
}
@@ -623,7 +626,7 @@ func (h *snapupCommitHandler) cleanupForSector() error {
623626
for fi := range fileURIs {
624627
uri := fileURIs[fi]
625628
errwg.Go(func() error {
626-
delErr := store.Del(h.committer.ctx, uri)
629+
delErr := store.Del(ctx, uri)
627630
if delErr == nil {
628631
log.Debugf("CC data cleaned: %s, store: %s", uri, storeInstance)
629632
return nil

‎damocles-manager/modules/impl/sectors/tracker.go

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/ipfs-force-community/damocles/damocles-manager/core"
1212
"github.com/ipfs-force-community/damocles/damocles-manager/modules/util"
1313
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
14+
storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
1415
)
1516

1617
var _ core.SectorTracker = (*Tracker)(nil)
@@ -41,6 +42,9 @@ func (t *Tracker) SinglePubToPrivateInfo(ctx context.Context, mid abi.ActorID, s
4142
}
4243

4344
func (t *Tracker) getPrivateInfo(ctx context.Context, sref core.SectorRef, upgrade bool, locator core.SectorLocator) (*sectorStoreInstances, core.PrivateSectorInfo, error) {
45+
ctx = storeMiner.NewContext(ctx, &storeMiner.MinerMeta{
46+
ID: uint64(sref.ID.Miner),
47+
})
4448
objins, err := t.getObjInstanceForSector(ctx, sref.ID, locator, upgrade)
4549
if err != nil {
4650
return nil, core.PrivateSectorInfo{}, fmt.Errorf("get location for %s: %w", util.FormatSectorID(sref.ID), err)

‎damocles-manager/modules/sealer/sealer.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/logging"
2525
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
2626
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/piecestore"
27+
storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
2728
)
2829

2930
var (
@@ -834,7 +835,10 @@ func (s *Sealer) AcquireUnsealDest(ctx context.Context, sid abi.SectorID, pieceC
834835
return s.unseal.AcquireDest(ctx, sid, pieceCid)
835836
}
836837

837-
func (s *Sealer) StoreUri(ctx context.Context, storeName string, resource string) (string, error) {
838+
func (s *Sealer) StoreUri(ctx context.Context, storeName, resource string, minerID uint64) (string, error) {
839+
ctx = storeMiner.NewContext(ctx, &storeMiner.MinerMeta{
840+
ID: minerID,
841+
})
838842
store, err := s.sectorIdxer.StoreMgr().GetInstance(ctx, storeName)
839843
if err != nil {
840844
return "", err

‎damocles-manager/modules/sealer/sealer_cli.go

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/kvstore"
2626
"github.com/ipfs-force-community/damocles/damocles-manager/pkg/objstore"
2727
"github.com/ipfs-force-community/damocles/damocles-manager/ver"
28+
storeMiner "github.com/ipfs-force-community/damocles/manager-plugin/objstore/miner"
2829
)
2930

3031
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 {
225226
}
226227
}
227228

229+
ctx = storeMiner.NewContext(ctx, &storeMiner.MinerMeta{
230+
ID: uint64(sid.Miner),
231+
})
232+
228233
dest := s.sectorIdxer.Normal()
229234
if state.Upgraded {
230235
dest = s.sectorIdxer.Upgrade()

0 commit comments

Comments
 (0)