lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcd: Add a special magic option hack

Browse Source 
Workaround some legacy code for now.
This commit is contained in:
James Shubin
2025-03-11 04:26:07 -04:00
parent 1cb9648b08
commit dce83efa96
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
etcd/etcd.go
View File

@@ -262,6 +262,9 @@ type EmbdEtcd struct { // EMBeddeD etcd
// NoNetwork causes this to use unix:// sockets instead of TCP for // NoNetwork causes this to use unix:// sockets instead of TCP for
// connections. // connections.
NoNetwork bool NoNetwork bool
// NoMagic turns off some things which aren't needed when used with a
// simple Seeds and NoServer option.
NoMagic bool
// Chooser is the implementation of the algorithm that decides which // Chooser is the implementation of the algorithm that decides which
// hosts to add or remove to grow and shrink the cluster. // hosts to add or remove to grow and shrink the cluster.
@@ -418,6 +421,10 @@ func (obj *EmbdEtcd) Validate() error {
} }
} }
if obj.NoMagic && !obj.NoServer {
return fmt.Errorf("we need Magic if we're a Server")
}
if _, err := etcdUtil.CopyURLs(obj.Seeds); err != nil { // this will validate if _, err := etcdUtil.CopyURLs(obj.Seeds); err != nil { // this will validate
return errwrap.Wrapf(err, "the Seeds are not valid") return errwrap.Wrapf(err, "the Seeds are not valid")
} }
@@ -1215,12 +1222,14 @@ func (obj *EmbdEtcd) Run() error {
obj.activateExit4.Ack() obj.activateExit4.Ack()
// startup endpoints watcher (to learn about other servers) // startup endpoints watcher (to learn about other servers)
if !obj.NoMagic { // disable possibly buggy code for now
ctx, cancel := context.WithCancel(unblockCtx) ctx, cancel := context.WithCancel(unblockCtx)
defer cancel() // cleanup on close... defer cancel() // cleanup on close...
if err := obj.runEndpoints(ctx); err != nil { if err := obj.runEndpoints(ctx); err != nil {
obj.activateExit5.Ack() obj.activateExit5.Ack()
return err return err
} }
}
obj.activateExit5.Ack() obj.activateExit5.Ack()
// We don't set state, we only watch others, so nothing to defer close! // We don't set state, we only watch others, so nothing to defer close!

5
lib/main.go
View File

@@ -179,6 +179,10 @@ type Config struct {
// clustering or opening tcp ports to the outside. // clustering or opening tcp ports to the outside.
NoNetwork bool `arg:"--no-network,env:MGMT_NO_NETWORK" help:"run single node instance without clustering or opening tcp ports to the outside"` NoNetwork bool `arg:"--no-network,env:MGMT_NO_NETWORK" help:"run single node instance without clustering or opening tcp ports to the outside"`
// NoMagic turns off some things which aren't needed when used with a
// simple Seeds and NoServer option.
NoMagic bool `arg:"--no-magic" help:"do not do any etcd magic (for simple clients)"`
// NoPgp disables pgp functionality. // NoPgp disables pgp functionality.
NoPgp bool `arg:"--no-pgp" help:"don't create pgp keys"` NoPgp bool `arg:"--no-pgp" help:"don't create pgp keys"`
@@ -511,6 +515,7 @@ func (obj *Main) Run() error {
NoServer: obj.NoServer, NoServer: obj.NoServer,
NoNetwork: obj.NoNetwork, NoNetwork: obj.NoNetwork,
NoMagic: obj.NoMagic,
Chooser: &chooser.DynamicSize{ Chooser: &chooser.DynamicSize{
IdealClusterSize: obj.idealClusterSize, IdealClusterSize: obj.idealClusterSize,

1
setup/svc.go
View File

@@ -118,6 +118,7 @@ func (obj *Svc) Run(ctx context.Context) error {
if obj.SetupSvcArgs.NoServer { if obj.SetupSvcArgs.NoServer {
argv = append(argv, "--no-server") argv = append(argv, "--no-server")
argv = append(argv, "--no-magic") // XXX: fix this workaround
} }
argv = append(argv, "empty $OPTS") argv = append(argv, "empty $OPTS")