Timemachine/mc-router
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow mc-router to scale a backend StatefulSet while routing traffic to a proxy via proxyServerName (#512)

Browse Source
This commit is contained in:
Chris Farhood
2026-02-13 08:07:27 -05:00
committed by GitHub
parent 1f86f88536
commit 21f349c2da
16 changed files with 527 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/routes.go
+36 -27
View File
@@ -36,8 +36,8 @@ type RouteFinder interface {
}
type RoutesHandler interface {
CreateMapping(serverAddress string, backend string, waker WakerFunc, sleeper SleeperFunc, asleepMOTD string)
SetDefaultRoute(backend string, waker WakerFunc, sleeper SleeperFunc, asleepMOTD string)
CreateMapping(serverAddress string, backend string, scalingTarget string, waker WakerFunc, sleeper SleeperFunc, asleepMOTD string)
SetDefaultRoute(backend string, scalingTarget string, waker WakerFunc, sleeper SleeperFunc, asleepMOTD string)
// DeleteMapping requests that the serverAddress be removed from routes.
// Returns true if the route existed.
DeleteMapping(serverAddress string) bool
@@ -50,13 +50,14 @@ type IRoutes interface {
RegisterAll(mappings map[string]string)
// FindBackendForServerAddress returns the host:port for the external server address, if registered.
// Otherwise, an empty string is returned. Also returns the normalized version of the given serverAddress.
// The 3rd value returned is an (optional) "waker" function which a caller must invoke to wake up serverAddress.
// The 4th value returned is an (optional) "sleeper" function which a caller must invoke to shut down serverAddress.
// The 3rd value returned is the scalingTarget which indicates what endpoint to scale (may differ from backend when using proxy).
// The 4th value returned is an (optional) "waker" function which a caller must invoke to wake up serverAddress.
// The 5th value returned is an (optional) "sleeper" function which a caller must invoke to shut down serverAddress.
HasRoute(serverAddress string) bool
FindBackendForServerAddress(ctx context.Context, serverAddress string) (string, string, WakerFunc, SleeperFunc)
GetSleepers(backend string) []SleeperFunc
FindBackendForServerAddress(ctx context.Context, serverAddress string) (string, string, string, WakerFunc, SleeperFunc)
GetSleepers(scalingTarget string) []SleeperFunc
GetMappings() map[string]string
GetDefaultRoute() (string, WakerFunc, SleeperFunc)
GetDefaultRoute() (string, string, WakerFunc, SleeperFunc)
GetAsleepMOTD(serverAddress string) string
SimplifySRV(srvEnabled bool)
}
@@ -73,15 +74,16 @@ func NewRoutes() IRoutes {
func (r *routesImpl) RegisterAll(mappings map[string]string) {
for k, v := range mappings {
r.CreateMapping(k, v, nil, nil, "")
r.CreateMapping(k, v, "", nil, nil, "")
}
}
type mapping struct {
backend string
waker WakerFunc
sleeper SleeperFunc
asleepMOTD string
backend string
waker WakerFunc
sleeper SleeperFunc
asleepMOTD string
scalingTarget string // The endpoint to scale (may differ from backend when using proxy)
}
type routesImpl struct {
@@ -96,16 +98,19 @@ func (r *routesImpl) Reset() {
DownScaler.Reset()
}
func (r *routesImpl) SetDefaultRoute(backend string, waker WakerFunc, sleeper SleeperFunc, asleepMOTD string) {
r.defaultRoute = mapping{backend: backend, waker: waker, sleeper: sleeper, asleepMOTD: asleepMOTD}
func (r *routesImpl) SetDefaultRoute(backend string, scalingTarget string, waker WakerFunc, sleeper SleeperFunc, asleepMOTD string) {
if scalingTarget == "" {
scalingTarget = backend
}
r.defaultRoute = mapping{backend: backend, scalingTarget: scalingTarget, waker: waker, sleeper: sleeper, asleepMOTD: asleepMOTD}
logrus.WithFields(logrus.Fields{
"backend": backend,
}).Info("Using default route")
}
func (r *routesImpl) GetDefaultRoute() (string, WakerFunc, SleeperFunc) {
return r.defaultRoute.backend, r.defaultRoute.waker, r.defaultRoute.sleeper
func (r *routesImpl) GetDefaultRoute() (string, string, WakerFunc, SleeperFunc) {
return r.defaultRoute.backend, r.defaultRoute.scalingTarget, r.defaultRoute.waker, r.defaultRoute.sleeper
}
func (r *routesImpl) GetAsleepMOTD(serverAddress string) string {
@@ -134,7 +139,7 @@ func (r *routesImpl) HasRoute(serverAddress string) bool {
return exists
}
func (r *routesImpl) FindBackendForServerAddress(_ context.Context, serverAddress string) (string, string, WakerFunc, SleeperFunc) {
func (r *routesImpl) FindBackendForServerAddress(_ context.Context, serverAddress string) (string, string, string, WakerFunc, SleeperFunc) {
r.RLock()
defer r.RUnlock()
@@ -173,23 +178,23 @@ func (r *routesImpl) FindBackendForServerAddress(_ context.Context, serverAddres
if r.mappings != nil {
if mapping, exists := r.mappings[serverAddress]; exists {
return mapping.backend, serverAddress, mapping.waker, mapping.sleeper
return mapping.backend, serverAddress, mapping.scalingTarget, mapping.waker, mapping.sleeper
}
}
return r.defaultRoute.backend, serverAddress, r.defaultRoute.waker, r.defaultRoute.sleeper
return r.defaultRoute.backend, serverAddress, r.defaultRoute.scalingTarget, r.defaultRoute.waker, r.defaultRoute.sleeper
}
func (r *routesImpl) GetSleepers(backend string) []SleeperFunc {
func (r *routesImpl) GetSleepers(scalingTarget string) []SleeperFunc {
r.RLock()
defer r.RUnlock()
var sleepers []SleeperFunc
for _, m := range r.mappings {
if m.backend == backend && m.sleeper != nil {
if m.scalingTarget == scalingTarget && m.sleeper != nil {
sleepers = append(sleepers, m.sleeper)
}
}
if r.defaultRoute.backend == backend && r.defaultRoute.sleeper != nil {
if r.defaultRoute.scalingTarget == scalingTarget && r.defaultRoute.sleeper != nil {
sleepers = append(sleepers, r.defaultRoute.sleeper)
}
return sleepers
@@ -212,7 +217,7 @@ func (r *routesImpl) DeleteMapping(serverAddress string) bool {
logrus.WithField("serverAddress", serverAddress).Info("Deleting route")
if m, ok := r.mappings[serverAddress]; ok {
DownScaler.Cancel(m.backend)
DownScaler.Cancel(m.scalingTarget)
delete(r.mappings, serverAddress)
return true
} else {
@@ -220,20 +225,24 @@ func (r *routesImpl) DeleteMapping(serverAddress string) bool {
}
}
func (r *routesImpl) CreateMapping(serverAddress string, backend string, waker WakerFunc, sleeper SleeperFunc, asleepMOTD string) {
func (r *routesImpl) CreateMapping(serverAddress string, backend string, scalingTarget string, waker WakerFunc, sleeper SleeperFunc, asleepMOTD string) {
r.Lock()
defer r.Unlock()
serverAddress = strings.ToLower(serverAddress)
if scalingTarget == "" {
scalingTarget = backend
}
logrus.WithFields(logrus.Fields{
"serverAddress": serverAddress,
"backend": backend,
}).Info("Created route mapping")
r.mappings[serverAddress] = mapping{backend: backend, waker: waker, sleeper: sleeper, asleepMOTD: asleepMOTD}
r.mappings[serverAddress] = mapping{backend: backend, scalingTarget: scalingTarget, waker: waker, sleeper: sleeper, asleepMOTD: asleepMOTD}
// Trigger auto scale down when mapping is created to ensure servers are shut down if router restarts
if DownScaler != nil && backend != "" {
DownScaler.Begin(backend)
if DownScaler != nil && scalingTarget != "" {
DownScaler.Begin(scalingTarget)
}
}