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

fix(scheduler): Add >0 replica check for server filter scheduling #4928

Merged
merged 2 commits into from
Jul 10, 2023
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
21 changes: 21 additions & 0 deletions scheduler/pkg/scheduler/filters/serverreplicas.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package filters

import (
"fmt"

"github.com/seldonio/seldon-core/scheduler/v2/pkg/store"
)

type ServerReplicaFilter struct{}

func (r ServerReplicaFilter) Name() string {
return "ServerReplicaFilter"
}

func (r ServerReplicaFilter) Filter(model *store.ModelVersion, server *store.ServerSnapshot) bool {
return len(server.Replicas) > 0
Copy link
Member

Choose a reason for hiding this comment

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

Could we make this a bit more general to filter out any server with number of replicas < number of model replicas?

Although I am not sure if it can cause any issues with scaling models.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we catch this later though anyway

}

func (r ServerReplicaFilter) Description(model *store.ModelVersion, server *store.ServerSnapshot) string {
return fmt.Sprintf("%d server replicas (waiting for server replicas to connect)", len(server.Replicas))
}
61 changes: 61 additions & 0 deletions scheduler/pkg/scheduler/filters/serverreplicas_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package filters

import (
"testing"

. "github.com/onsi/gomega"

pb "github.com/seldonio/seldon-core/apis/go/v2/mlops/scheduler"

"github.com/seldonio/seldon-core/scheduler/v2/pkg/store"
)

func TestServerReplicasFilter(t *testing.T) {
g := NewGomegaWithT(t)

type test struct {
name string
model *store.ModelVersion
server *store.ServerSnapshot
expected bool
}
serverName := "server1"
model := store.NewModelVersion(
&pb.Model{ModelSpec: &pb.ModelSpec{}, DeploymentSpec: &pb.DeploymentSpec{Replicas: 1}},
1,
serverName,
map[int]store.ReplicaStatus{3: {State: store.Loading}},
false,
store.ModelProgressing)
tests := []test{
{
name: "No Replicas",
model: model,
server: &store.ServerSnapshot{Name: serverName,
Shared: true,
ExpectedReplicas: 0,
},
expected: false,
},
{
name: "Replicas",
model: model,
server: &store.ServerSnapshot{Name: serverName,
Shared: true,
ExpectedReplicas: 0,
Replicas: map[int]*store.ServerReplica{
0: &store.ServerReplica{},
},
},
expected: true,
},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
filter := ServerReplicaFilter{}
ok := filter.Filter(test.model, test.server)
g.Expect(ok).To(Equal(test.expected))
})
}
}
2 changes: 1 addition & 1 deletion scheduler/pkg/scheduler/scheduler.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ type SchedulerConfig struct {

func DefaultSchedulerConfig(store store.ModelStore) SchedulerConfig {
return SchedulerConfig{
serverFilters: []filters.ServerFilter{filters.SharingServerFilter{}, filters.DeletedServerFilter{}},
serverFilters: []filters.ServerFilter{filters.ServerReplicaFilter{}, filters.SharingServerFilter{}, filters.DeletedServerFilter{}},
replicaFilters: []filters.ReplicaFilter{filters.RequirementsReplicaFilter{}, filters.AvailableMemoryReplicaFilter{}, filters.ExplainerFilter{}, filters.ReplicaDrainingFilter{}},
serverSorts: []sorters.ServerSorter{},
replicaSorts: []sorters.ReplicaSorter{sorters.ReplicaIndexSorter{}, sorters.AvailableMemorySorter{}, sorters.ModelAlreadyLoadedSorter{}},
Expand Down
Loading