Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance: adding virtual resource allocator #33508

Merged
merged 5 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
171 changes: 171 additions & 0 deletions pkg/util/vralloc/alloc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
// Licensed to the LF AI & Data foundation under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package vralloc

import (
"maps"
"sync"

"github.com/shirou/gopsutil/v3/disk"

"github.com/milvus-io/milvus/pkg/util/hardware"
)

type Resource struct {
Memory int64 // Memory occupation in bytes
CPU int64 // CPU in cycles per second
Disk int64 // Disk occpuation in bytes
}

// Add adds r2 to r
func (r *Resource) Add(r2 *Resource) *Resource {
r.Memory += r2.Memory
r.CPU += r2.CPU
r.Disk += r2.Disk
return r
}

// Sub subtracts r2 from r
func (r *Resource) Sub(r2 *Resource) *Resource {
r.Memory -= r2.Memory
r.CPU -= r2.CPU
r.Disk -= r2.Disk
return r
}

func (r *Resource) Diff(r2 *Resource) *Resource {
return &Resource{
Memory: r.Memory - r2.Memory,
CPU: r.CPU - r2.CPU,
Disk: r.Disk - r2.Disk,
}
}

// Le tests if the resource is less than or equal to the limit
func (r Resource) Le(limit *Resource) bool {
return r.Memory <= limit.Memory && r.CPU <= limit.CPU && r.Disk <= limit.Disk
}

type Allocator interface {
// Allocate allocates the resource, returns true if the resource is allocated. If allocation failed, returns the short resource.
// The short resource is a positive value, e.g., if there is additional 8 bytes in disk needed, returns (0, 0, 8).
Allocate(id string, r *Resource) (allocated bool, short *Resource)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better to make id's type as generic type

// Release releases the resource
Release(id string)
// Used returns the used resource
Used() Resource
// Inspect returns the allocated resources
Inspect() map[string]*Resource
}

type FixedSizeAllocator struct {
limit *Resource

lock sync.RWMutex
used Resource
allocs map[string]*Resource
}

var _ Allocator = (*FixedSizeAllocator)(nil)

func (a *FixedSizeAllocator) Allocate(id string, r *Resource) (allocated bool, short *Resource) {
a.lock.Lock()
defer a.lock.Unlock()
if a.used.Add(r).Le(a.limit) {
_, ok := a.allocs[id]
if ok {
// Re-allocate on identical id is not allowed
return false, nil
}
a.allocs[id] = r
return true, nil
}
short = a.used.Diff(a.limit)
a.used.Sub(r)
return false, short
}

func (a *FixedSizeAllocator) Release(id string) {
a.lock.Lock()
defer a.lock.Unlock()
r, ok := a.allocs[id]
if !ok {
return

Check warning on line 107 in pkg/util/vralloc/alloc.go

View check run for this annotation

Codecov / codecov/patch

pkg/util/vralloc/alloc.go#L107

Added line #L107 was not covered by tests
}
delete(a.allocs, id)
a.used.Sub(r)
}

func (a *FixedSizeAllocator) Used() Resource {
a.lock.RLock()
defer a.lock.RUnlock()
return a.used
}

func (a *FixedSizeAllocator) Inspect() map[string]*Resource {
a.lock.RLock()
defer a.lock.RUnlock()
return maps.Clone(a.allocs)
}

func NewFixedSizeAllocator(limit *Resource) *FixedSizeAllocator {
return &FixedSizeAllocator{
limit: limit,
allocs: make(map[string]*Resource),
}
}

// PhysicalAwareFixedSizeAllocator allocates resources with additional consideration of physical resource usage.
type PhysicalAwareFixedSizeAllocator struct {
FixedSizeAllocator

hwLimit *Resource
dir string // watching directory for disk usage, probably got by paramtable.Get().LocalStorageCfg.Path.GetValue()
}

var _ Allocator = (*PhysicalAwareFixedSizeAllocator)(nil)

func (a *PhysicalAwareFixedSizeAllocator) Allocate(id string, r *Resource) (allocated bool, short *Resource) {
memoryUsage := int64(hardware.GetUsedMemoryCount())
diskUsage := int64(0)
if usageStats, err := disk.Usage(a.dir); err != nil {
diskUsage = int64(usageStats.Used)

Check warning on line 146 in pkg/util/vralloc/alloc.go

View check run for this annotation

Codecov / codecov/patch

pkg/util/vralloc/alloc.go#L146

Added line #L146 was not covered by tests
}

// Check if memory usage + future request estimation will exceed the memory limit
// Note that different allocators will not coordinate with each other, so the memory limit
// may be exceeded in concurrent allocations.
expected := &Resource{
Memory: a.Used().Memory + r.Memory + memoryUsage,
Disk: a.Used().Disk + r.Disk + diskUsage,
}
if expected.Le(a.hwLimit) {
return a.FixedSizeAllocator.Allocate(id, r)
}
return false, expected.Diff(a.hwLimit)

Check warning on line 159 in pkg/util/vralloc/alloc.go

View check run for this annotation

Codecov / codecov/patch

pkg/util/vralloc/alloc.go#L159

Added line #L159 was not covered by tests
}

func NewPhysicalAwareFixedSizeAllocator(limit *Resource, hwMemoryLimit, hwDiskLimit int64, dir string) *PhysicalAwareFixedSizeAllocator {
return &PhysicalAwareFixedSizeAllocator{
FixedSizeAllocator: FixedSizeAllocator{
limit: limit,
allocs: make(map[string]*Resource),
},
hwLimit: &Resource{Memory: hwMemoryLimit, Disk: hwDiskLimit},
dir: dir,
}
}
76 changes: 76 additions & 0 deletions pkg/util/vralloc/alloc_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
// Licensed to the LF AI & Data foundation under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package vralloc

import (
"fmt"
"sync"
"testing"

"github.com/stretchr/testify/assert"

"github.com/milvus-io/milvus/pkg/util/hardware"
)

func TestFixedSizeAllocator(t *testing.T) {
a := NewFixedSizeAllocator(&Resource{100, 100, 100})

allocated, _ := a.Allocate("a1", &Resource{10, 10, 10})
assert.Equal(t, true, allocated)
allocated, _ = a.Allocate("a2", &Resource{90, 90, 90})
assert.Equal(t, true, allocated)
allocated, short := a.Allocate("a3", &Resource{10, 0, 0})
assert.Equal(t, false, allocated)
assert.Equal(t, &Resource{10, 0, 0}, short)
a.Release("a2")
allocated, _ = a.Allocate("a3", &Resource{10, 0, 0})
assert.Equal(t, true, allocated)
m := a.Inspect()
assert.Equal(t, 2, len(m))
allocated, _ = a.Allocate("a1", &Resource{10, 0, 0})
assert.Equal(t, false, allocated)
}

func TestFixedSizeAllocatorRace(t *testing.T) {
a := NewFixedSizeAllocator(&Resource{100, 100, 100})
wg := new(sync.WaitGroup)
for i := 0; i < 100; i++ {
wg.Add(1)
go func(index int) {
defer wg.Done()
allocated, _ := a.Allocate(fmt.Sprintf("a%d", index), &Resource{1, 1, 1})
assert.Equal(t, true, allocated)
}(i)
}
wg.Wait()
m := a.Inspect()
assert.Equal(t, 100, len(m))
}

func TestPhysicalAwareFixedSizeAllocator(t *testing.T) {
hwMemoryLimit := int64(float32(hardware.GetMemoryCount()) * 0.9)
hwDiskLimit := int64(1<<63 - 1)
a := NewPhysicalAwareFixedSizeAllocator(&Resource{100, 100, 100}, hwMemoryLimit, hwDiskLimit, "/tmp")

allocated, _ := a.Allocate("a1", &Resource{10, 10, 10})
assert.Equal(t, true, allocated)
allocated, _ = a.Allocate("a2", &Resource{90, 90, 90})
assert.Equal(t, true, allocated)
allocated, short := a.Allocate("a3", &Resource{10, 0, 0})
assert.Equal(t, false, allocated)
assert.Equal(t, &Resource{10, 0, 0}, short)
}
Loading