Enable leader election on endpoints for controllers #14094
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
liggitt
reviewed
May 10, 2017
pkg/cmd/server/api/v1/types.go
Outdated
| // the kube-system namespace to coordinate the lock. This overrides the behavior of | ||
| // the controllerTTL value, and will instead use the leader election flags defined in | ||
| // the Kubernetes controllerArguments field. | ||
| LockServiceName *string `json:"lockServiceName"` |
There was a problem hiding this comment.
maybe avoid putting "service" in the config field, and instead specify the resource to avoid needing a new field once configmaps are supported (c.f. kubernetes/kubernetes#44857)?
|
Yeah
|
|
We may want to cherry-pick kubernetes/kubernetes#45478 |
smarterclayton
force-pushed
the
elect
branch
4 times, most recently
from
a2c15a9
to
cc2af2c
Compare
|
[test]
…On Fri, May 12, 2017 at 12:54 PM, OpenShift Bot ***@***.***> wrote:
continuous-integration/openshift-jenkins/test FAILURE (
https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1401/)
(Base Commit: f24a57f
<f24a57f>
)
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#14094 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ABG_p_McgHX0-VfftmSCvytnO9t_ghcHks5r5I69gaJpZM4NTjdO>
.
|
|
[test] |
|
Any other comments? Applied comment from before. Will follow up in a separate PR with extended tests. |
enj
reviewed
May 18, 2017
| return plug.New(!options.PauseControllers), func() {}, nil | ||
| } | ||
|
|
||
| client, err := etcd.MakeEtcdClient(options.EtcdClientInfo) |
There was a problem hiding this comment.
How does this work with etcd3?
There was a problem hiding this comment.
Same as before
There was a problem hiding this comment.
Goal is to move off this completely by 3.7
There was a problem hiding this comment.
Same as before
So we are storing data in both etcd v2 and v3 at the same time?
There was a problem hiding this comment.
The server doesn't actually care - two different APIs
0xmichalis
reviewed
May 18, 2017
| func legacyLeaderElectionStart(id, name string, leased *plug.Leased, lock rl.Interface, ttl time.Duration) func() { | ||
| return func() { | ||
| glog.V(2).Infof("Verifying no controller manager is running for %s", id) | ||
| wait.Poll(ttl/2, 0, func() (bool, error) { |
0xmichalis
reviewed
May 20, 2017
| }) | ||
| glog.V(2).Infof("Attempting to acquire controller lease as %s, renewing every %s", id, ttl) | ||
| go leased.Run() | ||
| go wait.Poll(ttl/2, 0, func() (bool, error) { |
There was a problem hiding this comment.
This one too is infinite
0xmichalis
reviewed
May 20, 2017
pkg/cmd/server/api/v1/types.go
Outdated
| // controller instance should lead. It defaults to "kube-system" | ||
| LockNamespace string `json:"lockNamespace"` | ||
| // LockResource is the group and resource name to use to coordinate for the controller lock. | ||
| // If unset, defaults to "Endpoints". |
|
Updated
…On Sat, May 20, 2017 at 11:04 AM, Michail Kargakis ***@***.*** > wrote:
***@***.**** commented on this pull request.
------------------------------
In pkg/cmd/server/api/v1/types.go
<#14094 (comment)>:
> // ServiceServingCert holds configuration for service serving cert signer which creates cert/key pairs for
// pods fulfilling a service to serve with.
ServiceServingCert ServiceServingCert `json:"serviceServingCert"`
}
+// ControllerElectionConfig contains configuration values for deciding how a controller
+// will be elected to act as leader.
+type ControllerElectionConfig struct {
+ // LockName is the resource name used to act as the lock for determining which controller
+ // instance should lead.
+ LockName string `json:"lockName"`
+ // LockNamespace is the resource namespace used to act as the lock for determining which
+ // controller instance should lead. It defaults to "kube-system"
+ LockNamespace string `json:"lockNamespace"`
+ // LockResource is the group and resource name to use to coordinate for the controller lock.
+ // If unset, defaults to "Endpoints".
s/Endpoints/endpoints/
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#14094 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ABG_p13VxEU18_2ughG_3uq2e2upAA4Mks5r7wEQgaJpZM4NTjdO>
.
|
|
If no other comments, [merge] |
|
[merge] exec flake
|
Support the new upstream module for leader election via a new config field and command line flag (--lock-service-name). If specified, the new style election will be used. The legacy etcd election (triggered by controllerTTL > 0) will wait to verify no endpoint object exists before competing for the etcd lease, and will step down if it detects the endpoint object is created. With these changes, the controllers can now be run as static pods on the masters and talk only to the API. This will allow them to appear in the api and be scraped by prometheus.
|
Evaluated for origin test up to 17c4ce7 |
|
Evaluated for origin merge up to 17c4ce7 |
|
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1656/) (Base Commit: 16c3f11) |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/770/) (Base Commit: 21254d2) (Image: devenv-rhel7_6260) |
marun
added a commit
to marun/origin
that referenced
this pull request
Jun 15, 2017
PR openshift#14094 added support for leader election on endpoints for controllers, but the legacy (etcd) mode was logging NotFound errors, which would be a normal condition when endpoints were not configured. This change ensures that logging only occurs for errors other than NotFound.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Support the new upstream module for leader election via a new config
field and command line flag (--lock-service-name). If specified, the new
style election will be used. The legacy etcd election (triggered by
controllerTTL > 0) will wait to verify no endpoint object exists before
competing for the etcd lease, and will step down if it detects the
endpoint object is created.
With these changes, the controllers can now be run as static pods on the
masters and talk only to the API. This will allow them to appear in the
api and be scraped by prometheus.
[test]