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

Fix labelselector error in reclaimPolicyManager #2707

Merged
merged 3 commits into from
Jun 15, 2020

Conversation

Yisaer
Copy link
Contributor

@Yisaer Yisaer commented Jun 15, 2020

What problem does this PR solve?

The label selector logic is wrong in reclaimPolicyManager's sync function which would cause TidbMonitor covered TidbCluster's reclaimPolicy, this request fix it.

fix #2697

Does this PR introduce a user-facing change?:

Fix the pv syncing error when `TidbMonitor` and `TidbCluster` have different value in `reclaimPolicy`

}
if string(latestPV.Spec.PersistentVolumeReclaimPolicy) == string(reclaimPolicy) {
return nil
}
Copy link
Contributor

Choose a reason for hiding this comment

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

don't check here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated.

Copy link
Contributor

@DanielZhangQD DanielZhangQD left a comment

Choose a reason for hiding this comment

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

LGTM

@Yisaer
Copy link
Contributor Author

Yisaer commented Jun 15, 2020

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit f643ef0 into pingcap:master Jun 15, 2020
ti-srebot pushed a commit to ti-srebot/tidb-operator that referenced this pull request Jun 15, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-1.1 in PR #2711

ti-srebot added a commit that referenced this pull request Jun 15, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Song Gao <disxiaofei@163.com>
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.

patch PV is printed continuously in the log of tidb-controller-manager
4 participants