embeddable etcdmain #5925
embeddable etcdmain #5925
Conversation
| } | ||
|
|
||
| // Etcd contains a running etcd server and its listeners. | ||
| type Etcd struct { |
There was a problem hiding this comment.
is it possible to move this out of etcdmain? probably etcd/embed.Server?
|
This is the direction I have in mind. Only comment is that we might move the etcd structure to somewhere else. etcdmain.Etcd seems strange to me. The original purpose of etcdmain is just to hold the main func. Now it grows... |
|
/cc @purpleidea |
| @@ -450,9 +513,9 @@ func initialClusterFromName(name string) string { | |||
| return fmt.Sprintf("%s=http://localhost:2380", n) | |||
| } | |||
|
|
|||
| func (cfg config) isNewCluster() bool { return cfg.clusterState.String() == clusterStateFlagNew } | |||
| func (cfg Config) isNewCluster() bool { return cfg.ClusterState == clusterStateFlagNew } | |||
| func (cfg config) isProxy() bool { return cfg.proxy.String() != proxyFlagOff } | |||
There was a problem hiding this comment.
still tearing this up; proxy config stuff will be private to etcdmain, regular etcd config stuff will be in embed
|
Thanks for looking into this. It's probably mentioning my earlier take on this in #5584 Let me know when this is passing and ready for review, I'll try refactoring my https://github.com/purpleidea/mgmt/ on top of it to get a feel for how it would work any any issues. |
heyitsanthony
force-pushed
the
embed-etcdmain
branch
7 times, most recently
from
c60ddad
to
aa95d0a
Compare
|
@purpleidea This pr tries to achieve what you want in: #5584, what openshift (another embedded etcd user) needs, what kuberentes wants, and what our friends from pingCAP needs. We figured it would be hard to ask you directly to coordinate with all the related people. So we decided to do it on our side. But we will try to make sure it achieves most of things you want. Thanks! |
| } | ||
|
|
||
| // config holds the config suitable for yaml parsing | ||
| type config struct { |
There was a problem hiding this comment.
do we use this for any other purpose? if this is just for yaml, probably we should rename this to configYAML.
|
@heyitsanthony Is the test failure related? seems like ctl_v3 failed. other than that, lgtm. |
|
@xiang90 yeah, there's something going on with the peer connections so quorum e2e tests are failing; still debugging. |
Lets programs embed etcd. Fixes etcd-io#5430
heyitsanthony
force-pushed
the
embed-etcdmain
branch
from
aa95d0a
to
c0299ca
Compare
Mostly a config / startEtcd refactor