This repository has been archived by the owner on Mar 28, 2020. It is now read-only.
k8sutil: add recovery container instead of overriding #1853
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
hongchaodeng
changed the title
|
Stress testing proves that this will fix the bug: https://jenkins-etcd.prod.coreos.systems/job/etcd-operator-flaketest/buildTimeTrend |
hongchaodeng
changed the title
|
@etcd-bot retest this please |
fanminshi
reviewed
Jan 12, 2018
| @@ -221,14 +222,17 @@ func addOwnerRefToObject(o metav1.Object, r metav1.OwnerReference) { | |||
| // It's special that it has new token, and might need recovery init containers | |||
| func NewSeedMemberPod(clusterName string, ms etcdutil.MemberSet, m *etcdutil.Member, cs api.ClusterSpec, owner metav1.OwnerReference, backupURL *url.URL) *v1.Pod { | |||
| token := uuid.New() | |||
| pod := NewEtcdPod(m, ms.PeerURLPairs(), clusterName, "new", token, cs, owner) | |||
| pod := newEtcdPod(m, ms.PeerURLPairs(), clusterName, "new", token, cs) | |||
There was a problem hiding this comment.
why changing NewEtcdPod to newEtcdPod?
There was a problem hiding this comment.
nvm, i saw there is a order change.
|
test this pr. still see the same issue. |
Also fix the ordering to apply pod policy on recovery containers too
|
This PR will make it more stable, but it still encountered failure: https://jenkins-etcd.prod.coreos.systems/job/etcd-operator-flaketest/buildTimeTrend So there are other bugs we need to dig. |
fanminshi
reviewed
Jan 12, 2018
|
|
||
| func NewEtcdPod(m *etcdutil.Member, initialCluster []string, clusterName, state, token string, cs api.ClusterSpec, owner metav1.OwnerReference) *v1.Pod { | ||
| pod := newEtcdPod(m, initialCluster, clusterName, state, token, cs) | ||
| applyPodPolicy(clusterName, pod, cs.Pod) | ||
| addOwnerRefToObject(pod.GetObjectMeta(), owner) |
There was a problem hiding this comment.
I think addOwnerRefToObject can stay in the newEtcdPod function. I don't think order of addOwnerRefToObject matters.
There was a problem hiding this comment.
The addOwnerRefToObject() doesn't matter. But it's good to separate one param owner out of newEtcdPod().
| if backupURL != nil { | ||
| addRecoveryToPod(pod, token, m, cs, backupURL) | ||
| } | ||
| applyPodPolicy(clusterName, pod, cs.Pod) | ||
| addOwnerRefToObject(pod.GetObjectMeta(), owner) |
There was a problem hiding this comment.
It seems to me the order of calling applyPodPolicy is important because this code reasons about init containers.
I don't think order of addOwnerRefToObject matters in this case. correct me if i am wrong.
|
LGTM |
|
lgtm |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Also fix the ordering to apply pod policy on recovery containers too
ref: #1825 (comment)