TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 95 Pull requests 4 Projects Releases 1 Activity Actions

HRW usage optimize #75

Merged
dstepanov-yadro merged 2 commits from feat/hrw-optimize into master 2023-02-28 10:36:26 +00:00
Conversation 0 Commits 2 Files changed 8 +21 -13
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8b1bed42aa - Show all commits

4
pkg/local_object_storage/engine/engine.go
View file

@ -19,7 +19,7 @@ type StorageEngine struct {
mtx *sync.RWMutex mtx *sync.RWMutex
shards map[string]shardWrapper shards map[string]hashedShard
shardPools map[string]util.WorkerPool shardPools map[string]util.WorkerPool
@ -223,7 +223,7 @@ func New(opts ...Option) *StorageEngine {
return &StorageEngine{ return &StorageEngine{
cfg: c, cfg: c,
mtx: new(sync.RWMutex), mtx: new(sync.RWMutex),
shards: make(map[string]shardWrapper), shards: make(map[string]hashedShard),
shardPools: make(map[string]util.WorkerPool), shardPools: make(map[string]util.WorkerPool),
closeCh: make(chan struct{}), closeCh: make(chan struct{}),
setModeCh: make(chan setModeRequest), setModeCh: make(chan setModeRequest),

10
pkg/local_object_storage/engine/engine_test.go
View file

@ -21,6 +21,7 @@ import (
oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test"
usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test"
"github.com/TrueCloudLab/frostfs-sdk-go/version" "github.com/TrueCloudLab/frostfs-sdk-go/version"
"github.com/TrueCloudLab/hrw"
"github.com/TrueCloudLab/tzhash/tz" "github.com/TrueCloudLab/tzhash/tz"
"github.com/panjf2000/ants/v2" "github.com/panjf2000/ants/v2"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -86,9 +87,12 @@ func testNewEngineWithShards(shards ...*shard.Shard) *StorageEngine {
panic(err) panic(err)
} }
engine.shards[s.ID().String()] = shardWrapper{ engine.shards[s.ID().String()] = hashedShard{
errorCount: atomic.NewUint32(0), shardWrapper: shardWrapper{
Shard: s, errorCount: atomic.NewUint32(0),
Shard: s,
},
hash: hrw.Hash([]byte(s.ID().String())),
} }
engine.shardPools[s.ID().String()] = pool engine.shardPools[s.ID().String()] = pool
} }

20
pkg/local_object_storage/engine/shards.go
View file

@ -16,7 +16,10 @@ import (
var errShardNotFound = logicerr.New("shard not found") var errShardNotFound = logicerr.New("shard not found")
type hashedShard shardWrapper type hashedShard struct {
shardWrapper
hash uint64
}
type metricsWithID struct { type metricsWithID struct {
id string id string
@ -127,9 +130,12 @@ func (e *StorageEngine) addShard(sh *shard.Shard) error {
return fmt.Errorf("shard with id %s was already added", strID) return fmt.Errorf("shard with id %s was already added", strID)
} }
e.shards[strID] = shardWrapper{ e.shards[strID] = hashedShard{
errorCount: atomic.NewUint32(0), shardWrapper: shardWrapper{
Shard: sh, errorCount: atomic.NewUint32(0),
Shard: sh,
},
hash: hrw.Hash([]byte(strID)),
} }
e.shardPools[strID] = pool e.shardPools[strID] = pool
@ -144,7 +150,7 @@ func (e *StorageEngine) removeShards(ids ...string) {
return return
} }
ss := make([]shardWrapper, 0, len(ids)) ss := make([]hashedShard, 0, len(ids))
e.mtx.Lock() e.mtx.Lock()
for _, id := range ids { for _, id := range ids {
@ -276,7 +282,5 @@ func (e *StorageEngine) HandleNewEpoch(epoch uint64) {
} }
func (s hashedShard) Hash() uint64 { func (s hashedShard) Hash() uint64 {
return hrw.Hash( return s.hash
[]byte(s.Shard.ID().String()),
)
} }