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.

Sign up for GitHub

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

Jump to bottom

refactoring to NodeSelector Interface #820

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactoring to NodeSelector Interface #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aad9dd
refactoring to NodeSelector Interface
Jul 8, 2022
a784159
fixing test cases for RegionSelector
Jul 8, 2022
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
4 changes: 4 additions & 0 deletions pkg/routing/selector/any.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ func (s *AnySelector) SelectNode(nodes []*livekit.Node) (*livekit.Node, error) {

return SelectSortedNode(nodes, s.SortBy)
}

func (s *AnySelector) filterNodes(nodes []*livekit.Node) ([]*livekit.Node, error) {
return nodes, nil
}
10 changes: 6 additions & 4 deletions pkg/routing/selector/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ var ErrUnsupportedSelector = errors.New("unsupported node selector")
// NodeSelector selects an appropriate node to run the current session
type NodeSelector interface {
SelectNode(nodes []*livekit.Node) (*livekit.Node, error)
filterNodes(nodes []*livekit.Node) ([]*livekit.Node, error)
}

func CreateNodeSelector(conf *config.Config) (NodeSelector, error) {
Expand All @@ -27,19 +28,20 @@ func CreateNodeSelector(conf *config.Config) (NodeSelector, error) {
case "cpuload":
return &CPULoadSelector{
CPULoadLimit: conf.NodeSelector.CPULoadLimit,
SortBy: conf.NodeSelector.SortBy,
SortBy: conf.NodeSelector.SortBy,
}, nil
case "sysload":
return &SystemLoadSelector{
SysloadLimit: conf.NodeSelector.SysloadLimit,
SortBy: conf.NodeSelector.SortBy,
SortBy: conf.NodeSelector.SortBy,
}, nil
case "regionaware":
s, err := NewRegionAwareSelector(conf.Region, conf.NodeSelector.Regions, conf.NodeSelector.SortBy)
s, err := NewRegionAwareSelector(conf.Region, conf.NodeSelector.Regions, conf.NodeSelector.SortBy, &SystemLoadSelector{
SysloadLimit: conf.NodeSelector.SysloadLimit,
})
if err != nil {
return nil, err
}
s.SysloadLimit = conf.NodeSelector.SysloadLimit
return s, nil
case "random":
logger.Warnw("random node selector is deprecated, please switch to \"any\" or another selector", nil)
Expand Down
10 changes: 6 additions & 4 deletions pkg/routing/selector/regionaware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,23 @@ import (

// RegionAwareSelector prefers available nodes that are closest to the region of the current instance
type RegionAwareSelector struct {
SystemLoadSelector
NodeSelector

CurrentRegion string
regionDistances map[string]float64
regions []config.RegionConfig
SortBy string
}

func NewRegionAwareSelector(currentRegion string, regions []config.RegionConfig, sortBy string) (*RegionAwareSelector, error) {
func NewRegionAwareSelector(currentRegion string, regions []config.RegionConfig, sortBy string, selector NodeSelector) (*RegionAwareSelector, error) {
if currentRegion == "" {
return nil, ErrCurrentRegionNotSet
}
// build internal map of distances
s := &RegionAwareSelector{
NodeSelector: selector,
CurrentRegion: currentRegion,
regionDistances: make(map[string]float64),
regionDistances: make(map[string]float64, len(regions)),
regions: regions,
SortBy: sortBy,
}
Expand Down Expand Up @@ -52,7 +54,7 @@ func NewRegionAwareSelector(currentRegion string, regions []config.RegionConfig,
}

func (s *RegionAwareSelector) SelectNode(nodes []*livekit.Node) (*livekit.Node, error) {
nodes, err := s.SystemLoadSelector.filterNodes(nodes)
nodes, err := s.NodeSelector.filterNodes(nodes)
if err != nil {
return nil, err
}
Expand Down
28 changes: 18 additions & 10 deletions pkg/routing/selector/regionaware_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ func TestRegionAwareRouting(t *testing.T) {
nodes := []*livekit.Node{
newTestNodeInRegion("", false),
}
s, err := selector.NewRegionAwareSelector(regionEast, nil, sortBy)
s, err := selector.NewRegionAwareSelector(regionEast, nil, sortBy, &selector.SystemLoadSelector{
SysloadLimit: loadLimit,
})
require.NoError(t, err)

node, err := s.SelectNode(nodes)
Expand All @@ -59,9 +61,10 @@ func TestRegionAwareRouting(t *testing.T) {
expectedNode,
newTestNodeInRegion(regionEast, false),
}
s, err := selector.NewRegionAwareSelector(regionEast, rc, sortBy)
s, err := selector.NewRegionAwareSelector(regionEast, rc, sortBy, &selector.SystemLoadSelector{
SysloadLimit: loadLimit,
})
require.NoError(t, err)
s.SysloadLimit = loadLimit

node, err := s.SelectNode(nodes)
require.NoError(t, err)
Expand All @@ -76,9 +79,10 @@ func TestRegionAwareRouting(t *testing.T) {
newTestNodeInRegion(regionWest, true),
newTestNodeInRegion(regionEast, false),
}
s, err := selector.NewRegionAwareSelector(regionEast, rc, sortBy)
s, err := selector.NewRegionAwareSelector(regionEast, rc, sortBy, &selector.SystemLoadSelector{
SysloadLimit: loadLimit,
})
require.NoError(t, err)
s.SysloadLimit = loadLimit

node, err := s.SelectNode(nodes)
require.NoError(t, err)
Expand All @@ -92,9 +96,10 @@ func TestRegionAwareRouting(t *testing.T) {
expectedNode,
newTestNodeInRegion(regionEast, true),
}
s, err := selector.NewRegionAwareSelector(regionSeattle, rc, sortBy)
s, err := selector.NewRegionAwareSelector(regionSeattle, rc, sortBy, &selector.SystemLoadSelector{
SysloadLimit: loadLimit,
})
require.NoError(t, err)
s.SysloadLimit = loadLimit

node, err := s.SelectNode(nodes)
require.NoError(t, err)
Expand All @@ -110,9 +115,10 @@ func TestRegionAwareRouting(t *testing.T) {
expectedNode,
expectedNode,
}
s, err := selector.NewRegionAwareSelector(regionSeattle, rc, sortBy)
s, err := selector.NewRegionAwareSelector(regionSeattle, rc, sortBy, &selector.SystemLoadSelector{
SysloadLimit: loadLimit,
})
require.NoError(t, err)
s.SysloadLimit = loadLimit

node, err := s.SelectNode(nodes)
require.NoError(t, err)
Expand All @@ -123,7 +129,9 @@ func TestRegionAwareRouting(t *testing.T) {
nodes := []*livekit.Node{
newTestNodeInRegion(regionWest, true),
}
s, err := selector.NewRegionAwareSelector(regionEast, rc, sortBy)
s, err := selector.NewRegionAwareSelector(regionEast, rc, sortBy, &selector.SystemLoadSelector{
SysloadLimit: loadLimit,
})
require.NoError(t, err)

node, err := s.SelectNode(nodes)
Expand Down