potyarkin/frostfs-qos
1
0
Fork 0
forked from TrueCloudLab/frostfs-qos
Code Pull requests Activity

Revert "[#7] mclock: Add tag stat"

Browse source 
This reverts commit 25102d1e1a.

Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2025-03-10 16:58:38 +03:00
parent d752a1c95e
commit 3e7ca94035
Signed by: dstepanov-yadro
GPG key ID: 237AF1A763293BC0
3 changed files with 2 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

150
scheduling/mclock_test.go
View file

@ -39,21 +39,6 @@ func TestMClockSharesScheduling(t *testing.T) {
releases = append(releases, release)
}
stats := q.Stats()
require.Equal(t, 2, len(stats))
for _, s := range stats {
switch s.Tag() {
case "class1":
require.Equal(t, uint64(1), s.InProgress())
require.Equal(t, uint64(reqCount/2-1), s.Pending())
case "class2":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(reqCount/2), s.Pending())
default:
require.Fail(t, "unknown tag:"+s.Tag())
}
}
var result []string
var wg sync.WaitGroup
for i := 0; i < reqCount; i++ {
@ -67,21 +52,6 @@ func TestMClockSharesScheduling(t *testing.T) {
}
wg.Wait()
stats = q.Stats()
require.Equal(t, 2, len(stats))
for _, s := range stats {
switch s.Tag() {
case "class1":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(0), s.Pending())
case "class2":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(0), s.Pending())
default:
require.Fail(t, "unknown tag:"+s.Tag())
}
}
// Requests must be scheduled as class1->class1->class2->class1->class1->class2...,
// because the ratio is 2 to 1.
// However, there may be deviations due to rounding and sorting.
@ -146,37 +116,7 @@ func TestMClockRequestCancel(t *testing.T) {
require.Equal(t, 0, q.limitQueue.Len())
require.Equal(t, 0, q.reservationQueue.Len())
stats := q.Stats()
require.Equal(t, 2, len(stats))
for _, s := range stats {
switch s.Tag() {
case "class1":
require.Equal(t, uint64(1), s.InProgress())
require.Equal(t, uint64(0), s.Pending())
case "class2":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(0), s.Pending())
default:
require.Fail(t, "unknown tag:"+s.Tag())
}
}
release1()
stats = q.Stats()
require.Equal(t, 2, len(stats))
for _, s := range stats {
switch s.Tag() {
case "class1":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(0), s.Pending())
case "class2":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(0), s.Pending())
default:
require.Fail(t, "unknown tag:"+s.Tag())
}
}
}
func TestMClockLimitScheduling(t *testing.T) {
@ -219,21 +159,6 @@ func TestMClockLimitScheduling(t *testing.T) {
}
}
stats := q.Stats()
require.Equal(t, 2, len(stats))
for _, s := range stats {
switch s.Tag() {
case "class1":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(reqCount/2), s.Pending())
case "class2":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(reqCount/2), s.Pending())
default:
require.Fail(t, "unknown tag:"+s.Tag())
}
}
cl.v = math.MaxFloat64
var result []string
@ -277,21 +202,6 @@ func TestMClockLimitScheduling(t *testing.T) {
require.Equal(t, 0, q.sharesQueue.Len())
require.Equal(t, 0, q.limitQueue.Len())
require.Equal(t, 0, q.reservationQueue.Len())
stats = q.Stats()
require.Equal(t, 2, len(stats))
for _, s := range stats {
switch s.Tag() {
case "class1":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(0), s.Pending())
case "class2":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(0), s.Pending())
default:
require.Fail(t, "unknown tag:"+s.Tag())
}
}
}
func TestMClockReservationScheduling(t *testing.T) {
@ -335,39 +245,9 @@ func TestMClockReservationScheduling(t *testing.T) {
}
}
stats := q.Stats()
require.Equal(t, 2, len(stats))
for _, s := range stats {
switch s.Tag() {
case "class1":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(reqCount/2), s.Pending())
case "class2":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(reqCount/2), s.Pending())
default:
require.Fail(t, "unknown tag:"+s.Tag())
}
}
cl.v = 1.00001 // 1s elapsed
q.scheduleRequest()
stats = q.Stats()
require.Equal(t, 2, len(stats))
for _, s := range stats {
switch s.Tag() {
case "class1":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(reqCount/2), s.Pending())
case "class2":
require.Equal(t, uint64(100), s.InProgress())
require.Equal(t, uint64(reqCount/2-100), s.Pending())
default:
require.Fail(t, "unknown tag:"+s.Tag())
}
}
var result []string
for i, req := range requests {
select {
@ -383,21 +263,6 @@ func TestMClockReservationScheduling(t *testing.T) {
require.Equal(t, "class2", res)
}
stats = q.Stats()
require.Equal(t, 2, len(stats))
for _, s := range stats {
switch s.Tag() {
case "class1":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(reqCount/2), s.Pending())
case "class2":
require.Equal(t, uint64(0), s.InProgress())
require.Equal(t, uint64(reqCount/2-100), s.Pending())
default:
require.Fail(t, "unknown tag:"+s.Tag())
}
}
cl.v = math.MaxFloat64
q.scheduleRequest()
@ -405,21 +270,6 @@ func TestMClockReservationScheduling(t *testing.T) {
require.Equal(t, 0, q.sharesQueue.Len())
require.Equal(t, 0, q.limitQueue.Len())
require.Equal(t, 0, q.reservationQueue.Len())
stats = q.Stats()
require.Equal(t, 2, len(stats))
for _, s := range stats {
switch s.Tag() {
case "class1":
require.Equal(t, uint64(reqCount/2), s.InProgress())
require.Equal(t, uint64(0), s.Pending())
case "class2":
require.Equal(t, uint64(reqCount/2-100), s.InProgress())
require.Equal(t, uint64(0), s.Pending())
default:
require.Fail(t, "unknown tag:"+s.Tag())
}
}
}
func TestMClockIdleTag(t *testing.T) {