Skip to content

Etcd v3.1.0-alpha.0 with embedding and gRPC support #10976

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.

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

Merged
merged 4 commits into from
Sep 28, 2016

Conversation

smarterclayton
Copy link
Contributor

No description provided.

@smarterclayton smarterclayton force-pushed the etcd_310 branch 2 times, most recently from 65d7764 to 0c64ae8 Compare September 18, 2016 16:34
@smarterclayton smarterclayton changed the title WIP - Etcd v3.1.0-alpha.0 with embedding and gRPC support Etcd v3.1.0-alpha.0 with embedding and gRPC support Sep 18, 2016
@smarterclayton
Copy link
Contributor Author

[test]

@smarterclayton smarterclayton force-pushed the etcd_310 branch 2 times, most recently from 173aba1 to fc95ba7 Compare September 18, 2016 23:59
@smarterclayton
Copy link
Contributor Author

[test]

@smarterclayton
Copy link
Contributor Author

Flaked on rollout history on deployments. We appear to be unable to schedule more pods - the service endpoints test, this test, and the deploy iteratively test all rely on having enough room to schedule. We need to add debugging to it.

@smarterclayton
Copy link
Contributor Author

@liggitt if you can review the etcd master server startup change.

@smarterclayton
Copy link
Contributor Author

hack/test-cmd.sh has failed: idle.sh:34: executing 'oc get pod -l app=idling-echo -o go-template='{{ len .items }}'' expecting any result and text '2'; re-trying every 0.2s until completion or 60.000s

[test]

@smarterclayton
Copy link
Contributor Author

smarterclayton commented Sep 20, 2016 via email

2 similar comments
@smarterclayton
Copy link
Contributor Author

[test]

@smarterclayton
Copy link
Contributor Author

[test]

@smarterclayton
Copy link
Contributor Author

@liggitt review

On Mon, Sep 26, 2016 at 4:02 PM, OpenShift Bot [email protected]
wrote:

continuous-integration/openshift-jenkins/test Running (
https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/9313/)


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#10976 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABG_pxl48rTeZ5wNI5l3Lvxfqpq-_BK2ks5quCTsgaJpZM4J_xaZ
.

@liggitt
Copy link
Contributor

liggitt commented Sep 27, 2016

if someone starts an existing data store with this, it'll be impossible for them to roll back to an older version of origin, right? if so, worth noting in the release notes

@@ -23,10 +23,6 @@ fi

# setup a private GOPATH so the build can succeed
export GOPATH="${PWD}/gopath"
rm -f "${GOPATH}/src/github.com/coreos/etcd"
mkdir -p "${GOPATH}/src/github.com/coreos"
ln -s "${PWD}" "${GOPATH}/src/github.com/coreos/etcd"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what was the original reason for this, and why is it no longer needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

etcd ./build does this now - they didn't used to control their gopath, now they do

@@ -26,7 +26,8 @@ os::test::junit::declare_suite_start "cmd/basicresources/versionreporting"
os::build::get_version_vars
os_git_regex="$( escape_regex "${OS_GIT_VERSION%%-*}" )"
kube_git_regex="$( escape_regex "${KUBE_GIT_VERSION%%-*}" )"
etcd_git_regex="$( escape_regex "${ETCD_GIT_VERSION%%-*}" )"
etcd_version="$(echo "${ETCD_GIT_VERSION}" | sed -E "s/\-.*//g" | sed -E "s/v//")"
etcd_git_regex="$( escape_regex "${etcd_version%%-*}" )"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

raises eyebrow

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

etcd doesn't follow our regex rules

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

follow our version style rules


select {
case <-e.Server.ReadyNotify():
glog.Infof("Started etcd at %s", etcdServerConfig.Address)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems wrong... if we reach this log line, we'll immediately fatal below?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It waits on the error channel.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah


// addressToURLs turns a host:port comma delimited list into an array valid
// URL strings with the appropriate prefix for the TLS mode.
func addressToURLs(addr string, isTLS bool) []string {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we're passing in bind addresses here... is https://0.0.0.0:4001 going to be valid?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, same as before. The logic for calculating addresses simply moved deeper.

}
osutil.HandleInterrupts()
s.Start()
osutil.RegisterInterruptHandler(s.Stop)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

were the interrupt handlers important?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, added them back.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although now it's survivable.

@smarterclayton
Copy link
Contributor Author

Impossible if they start older than 2.3.7 I believe.

On Tue, Sep 27, 2016 at 10:35 AM, OpenShift Bot [email protected]
wrote:

continuous-integration/openshift-jenkins/test Running (
https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/9346/)


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#10976 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABG_pydRwCoFuiEFulDnz5lZR_1V5WtJks5quSmtgaJpZM4J_xaZ
.


select {
case <-e.Server.ReadyNotify():
glog.Infof("Started etcd at %s", etcdServerConfig.Address)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah

cfg.ClientTLSInfo.CAFile = etcdServerConfig.ServingInfo.ClientCA
cfg.ClientTLSInfo.CertFile = etcdServerConfig.ServingInfo.ServerCert.CertFile
cfg.ClientTLSInfo.KeyFile = etcdServerConfig.ServingInfo.ServerCert.KeyFile
cfg.ClientTLSInfo.ClientCertAuth = len(cfg.ClientTLSInfo.CertFile) > 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should trigger off the ClientCA being specified, not the cert file

cfg.PeerTLSInfo.CAFile = etcdServerConfig.PeerServingInfo.ClientCA
cfg.PeerTLSInfo.CertFile = etcdServerConfig.PeerServingInfo.ServerCert.CertFile
cfg.PeerTLSInfo.KeyFile = etcdServerConfig.PeerServingInfo.ServerCert.KeyFile
cfg.PeerTLSInfo.ClientCertAuth = len(cfg.PeerTLSInfo.CertFile) > 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, len(ClientCA) > 0

@smarterclayton
Copy link
Contributor Author

smarterclayton commented Sep 27, 2016 via email

@liggitt
Copy link
Contributor

liggitt commented Sep 27, 2016

LGTM after squash of review commit

@smarterclayton
Copy link
Contributor Author

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Sep 27, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/9381/) (Image: devenv-rhel7_5092)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 604ff86

@smarterclayton
Copy link
Contributor Author

[test] #11024

On Tue, Sep 27, 2016 at 4:48 PM, OpenShift Bot [email protected]
wrote:

continuous-integration/openshift-jenkins/test FAILURE (
https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/9367/)


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#10976 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABG_p1ny4QTOFpIfwK0ZQ3ZpgM7VZ2BUks5quYEDgaJpZM4J_xaZ
.

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 604ff86

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/9381/)

@openshift-bot openshift-bot merged commit 2d77a91 into openshift:master Sep 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants