Skip to content
This repository was archived by the owner on Feb 21, 2024. It is now read-only.

Commit 20429bb

Browse files
travisturnerjaffee
travisturner
and
jaffee
authored
Remove MDS and replace it with Controller (#2219)
* Remove MDS and replace it with Controller This commit removes the MDS layer (and package) and shifts Controller package into its place. * add pprof/fgprof to serverless http router --------- Co-authored-by: Matthew Jaffee <[email protected]>
1 parent b12c90f commit 20429bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+606
-1370
lines changed

‎api.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3070,9 +3070,9 @@ func (api *API) Directive(ctx context.Context, d *dax.Directive) error {
30703070
}
30713071

30723072
// DirectiveApplied returns true if the computer's current Directive has been
3073-
// applied and is ready to be queried. This it temporary (primarily for tests)
3074-
// and needs to be refactored as we improve the logic around mds-to-computer
3075-
// communication.
3073+
// applied and is ready to be queried. This is temporary (primarily for tests)
3074+
// and needs to be refactored as we improve the logic around
3075+
// controller-to-computer communication.
30763076
func (api *API) DirectiveApplied(ctx context.Context) (bool, error) {
30773077
return api.holder.DirectiveApplied(), nil
30783078
}
@@ -3085,7 +3085,7 @@ func (api *API) SnapshotShardData(ctx context.Context, req *dax.SnapshotShardDat
30853085
}
30863086
// TODO(jaffee) confirm this node is actually responsible for the given
30873087
// shard? Not sure we need to given that this request comes from
3088-
// MDS, but might be a belt&suspenders situation.
3088+
// the Controller, but might be a belt&suspenders situation.
30893089

30903090
qtid := req.TableKey.QualifiedTableID()
30913091

‎ctl/dax.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ func BuildDAXFlags(cmd *cobra.Command, srv *server.Command) {
1414
flags.BoolVar(&srv.Config.Verbose, "verbose", srv.Config.Verbose, "Enable verbose logging")
1515
flags.StringVar(&srv.Config.LogPath, "log-path", srv.Config.LogPath, "Log path")
1616

17-
// MDS
18-
flags.BoolVar(&srv.Config.MDS.Run, "mds.run", srv.Config.MDS.Run, "Run the MDS service in process.")
19-
flags.DurationVar(&srv.Config.MDS.Config.RegistrationBatchTimeout, "mds.config.registration-batch-timeout", srv.Config.MDS.Config.RegistrationBatchTimeout, "Timeout for node registration batches.")
20-
flags.StringVar(&srv.Config.MDS.Config.DataDir, "mds.config.data-dir", srv.Config.MDS.Config.DataDir, "MDS directory to use in process.")
21-
flags.DurationVar(&srv.Config.MDS.Config.SnappingTurtleTimeout, "mds.config.snapping-turtle-timeout", srv.Config.MDS.Config.SnappingTurtleTimeout, "Period for running automatic snapshotting routine.")
17+
// Controller
18+
flags.BoolVar(&srv.Config.Controller.Run, "controller.run", srv.Config.Controller.Run, "Run the Controller service in process.")
19+
flags.DurationVar(&srv.Config.Controller.Config.RegistrationBatchTimeout, "controller.config.registration-batch-timeout", srv.Config.Controller.Config.RegistrationBatchTimeout, "Timeout for node registration batches.")
20+
flags.StringVar(&srv.Config.Controller.Config.DataDir, "controller.config.data-dir", srv.Config.Controller.Config.DataDir, "Controller directory to use in process.")
21+
flags.DurationVar(&srv.Config.Controller.Config.SnappingTurtleTimeout, "controller.config.snapping-turtle-timeout", srv.Config.Controller.Config.SnappingTurtleTimeout, "Period for running automatic snapshotting routine.")
2222

2323
// Queryer
2424
flags.BoolVar(&srv.Config.Queryer.Run, "queryer.run", srv.Config.Queryer.Run, "Run the Queryer service in process.")
25-
flags.StringVar(&srv.Config.Queryer.Config.MDSAddress, "queryer.config.mds-address", srv.Config.Queryer.Config.MDSAddress, "Address of remote MDS process.")
25+
flags.StringVar(&srv.Config.Queryer.Config.ControllerAddress, "queryer.config.controller-address", srv.Config.Queryer.Config.ControllerAddress, "Address of remote Controller process.")
2626

2727
// Computer
2828
flags.BoolVar(&srv.Config.Computer.Run, "computer.run", srv.Config.Computer.Run, "Run the Computer service in process.")

‎ctl/server.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func serverFlagSet(srv *server.Config, prefix string) *pflag.FlagSet {
3333

3434
flags := pflag.NewFlagSet("featurebase", pflag.ExitOnError)
3535
flags.StringVar(&srv.Name, pre("name"), srv.Name, "Name of the node in the cluster.")
36-
flags.StringVar(&srv.MDSAddress, pre("mds-address"), srv.MDSAddress, "MDS service to register with.")
36+
flags.StringVar(&srv.ControllerAddress, pre("controller-address"), srv.ControllerAddress, "Controller service to register with.")
3737
flags.StringVar(&srv.WriteloggerDir, pre("writelogger-dir"), srv.WriteloggerDir, "Writelogger directory to read/write append logs.")
3838
flags.StringVar(&srv.SnapshotterDir, pre("snapshotter-dir"), srv.SnapshotterDir, "Snapshotter directory to read/write snapshots.")
3939
flags.StringVarP(&srv.DataDir, pre("data-dir"), short("d"), srv.DataDir, "Directory to store FeatureBase data files.")
@@ -112,7 +112,7 @@ func serverFlagSet(srv *server.Config, prefix string) *pflag.FlagSet {
112112

113113
flags.BoolVar(&srv.SQL.EndpointEnabled, pre("sql.endpoint-enabled"), srv.SQL.EndpointEnabled, "Enable FeatureBase SQL /sql endpoint (default false)")
114114

115-
flags.DurationVar(&srv.CheckInInterval, pre("check-in-interval"), srv.CheckInInterval, "Interval between check-ins to MDS")
115+
flags.DurationVar(&srv.CheckInInterval, pre("check-in-interval"), srv.CheckInInterval, "Interval between check-ins to the Controller")
116116

117117
// Future flags.
118118
flags.BoolVar(&srv.Future.Rename, pre("future.rename"), false, "Present application name as FeatureBase. Defaults to false, will default to true in an upcoming release.")

‎dax/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ testv:
1515

1616
test-integration:
1717
mkdir -p ../coverage-from-docker
18-
$(GO) test ./test/dax -count 1 -run TestDAXIntegration/$(RUN)
18+
$(GO) test ./test/dax -count 1 -timeout 20m -run TestDAXIntegration/$(RUN)
1919

2020
testv-integration:
21-
$(GO) test -v ./test/dax -count 1 -run TestDAXIntegration/$(RUN)
21+
$(GO) test -v ./test/dax -count 1 -timeout 20m -run TestDAXIntegration/$(RUN)
2222

2323

2424
############################### AWS STUFF ###############################

‎dax/computer/interfaces.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
// Registrar represents the methods which Computer uses to register itself with
11-
// MDS.
11+
// the Controller.
1212
type Registrar interface {
1313
RegisterNode(ctx context.Context, node *dax.Node) error
1414
CheckInNode(ctx context.Context, node *dax.Node) error

‎dax/computer/service/computer.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
featurebase "github.com/featurebasedb/featurebase/v3"
1111
"github.com/featurebasedb/featurebase/v3/dax"
1212
"github.com/featurebasedb/featurebase/v3/dax/computer"
13-
mdsclient "github.com/featurebasedb/featurebase/v3/dax/mds/client"
13+
controllerclient "github.com/featurebasedb/featurebase/v3/dax/controller/client"
1414
"github.com/featurebasedb/featurebase/v3/dax/snapshotter"
1515
"github.com/featurebasedb/featurebase/v3/dax/writelogger"
1616
"github.com/featurebasedb/featurebase/v3/errors"
@@ -54,11 +54,11 @@ func (c *computerService) Start() error {
5454
c.computer = cmd
5555
}
5656

57-
if c.cfg.ComputerConfig.MDSAddress != "" {
58-
mdsAddr := dax.Address(c.cfg.ComputerConfig.MDSAddress)
59-
// Set mds (registrar) on computer.
60-
if err := c.SetMDS(mdsAddr); err != nil {
61-
return errors.Wrapf(err, "setting mds service on computer: %s", c.cfg.Name)
57+
if c.cfg.ComputerConfig.ControllerAddress != "" {
58+
controllerAddr := dax.Address(c.cfg.ComputerConfig.ControllerAddress)
59+
// Set Controller (registrar) on computer.
60+
if err := c.SetController(controllerAddr); err != nil {
61+
return errors.Wrapf(err, "setting controller service on computer: %s", c.cfg.Name)
6262
}
6363
}
6464
}
@@ -103,8 +103,8 @@ func (c *computerService) HTTPHandler() http.Handler {
103103
return c.computer.HTTPHandler()
104104
}
105105

106-
func (c *computerService) SetMDS(addr dax.Address) error {
107-
c.computer.Registrar = mdsclient.New(addr, c.logger)
106+
func (c *computerService) SetController(addr dax.Address) error {
107+
c.computer.Registrar = controllerclient.New(addr, c.logger)
108108
return nil
109109
}
110110

‎dax/mds/controller/balancer.go‎ renamed to ‎dax/controller/balancer.go‎

File renamed without changes.

‎dax/mds/controller/balancer/balancer.go‎ renamed to ‎dax/controller/balancer/balancer.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Package balancer is an implementation of the controller's Balancer interface.
1+
// Package balancer is an implementation of the controller.Balancer interface.
22
package balancer
33

44
import (
@@ -9,16 +9,16 @@ import (
99
"time"
1010

1111
"github.com/featurebasedb/featurebase/v3/dax"
12-
"github.com/featurebasedb/featurebase/v3/dax/mds/controller"
13-
"github.com/featurebasedb/featurebase/v3/dax/mds/schemar"
12+
"github.com/featurebasedb/featurebase/v3/dax/controller"
13+
"github.com/featurebasedb/featurebase/v3/dax/controller/schemar"
1414
"github.com/featurebasedb/featurebase/v3/errors"
1515
"github.com/featurebasedb/featurebase/v3/logger"
1616
)
1717

1818
// Ensure type implements interface.
1919
var _ controller.Balancer = (*Balancer)(nil)
2020

21-
// Balancer is an implementation of the controller.Balancer interface which
21+
// Balancer is an implementation of the balancer.Balancer interface which
2222
// isolates workers and jobs by database. It helps manage the relationships
2323
// between workers and jobs. The logic it uses to balance jobs across workers is
2424
// very simple; it bases everything off the number of workers and number of

‎dax/mds/controller/balancer/balancer_test.go‎ renamed to ‎dax/controller/balancer/balancer_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
"github.com/featurebasedb/featurebase/v3/dax"
1010
daxbolt "github.com/featurebasedb/featurebase/v3/dax/boltdb"
11-
"github.com/featurebasedb/featurebase/v3/dax/mds/controller"
12-
"github.com/featurebasedb/featurebase/v3/dax/mds/controller/balancer/boltdb"
13-
schemardb "github.com/featurebasedb/featurebase/v3/dax/mds/schemar/boltdb"
11+
"github.com/featurebasedb/featurebase/v3/dax/controller"
12+
"github.com/featurebasedb/featurebase/v3/dax/controller/balancer/boltdb"
13+
schemardb "github.com/featurebasedb/featurebase/v3/dax/controller/schemar/boltdb"
1414
daxtest "github.com/featurebasedb/featurebase/v3/dax/test"
1515
testbolt "github.com/featurebasedb/featurebase/v3/dax/test/boltdb"
1616
"github.com/featurebasedb/featurebase/v3/logger"

‎dax/mds/controller/balancer/boltdb/balancer.go‎ renamed to ‎dax/controller/balancer/boltdb/balancer.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ import (
99

1010
"github.com/featurebasedb/featurebase/v3/dax"
1111
"github.com/featurebasedb/featurebase/v3/dax/boltdb"
12-
"github.com/featurebasedb/featurebase/v3/dax/mds/controller"
13-
"github.com/featurebasedb/featurebase/v3/dax/mds/controller/balancer"
14-
"github.com/featurebasedb/featurebase/v3/dax/mds/schemar"
12+
balancer "github.com/featurebasedb/featurebase/v3/dax/controller/balancer"
13+
"github.com/featurebasedb/featurebase/v3/dax/controller/schemar"
1514
"github.com/featurebasedb/featurebase/v3/errors"
1615
"github.com/featurebasedb/featurebase/v3/logger"
1716
)
@@ -27,7 +26,7 @@ var BalancerBuckets []boltdb.Bucket = []boltdb.Bucket{
2726
}
2827

2928
// NewBalancer returns a new instance of controller.Balancer.
30-
func NewBalancer(db *boltdb.DB, schemar schemar.Schemar, logger logger.Logger) controller.Balancer {
29+
func NewBalancer(db *boltdb.DB, schemar schemar.Schemar, logger logger.Logger) *balancer.Balancer {
3130
fjs := newFreeJobService(db)
3231
wjs := newWorkerJobService(db, logger)
3332
fws := newFreeWorkerService(db)

0 commit comments

Comments
 (0)