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

rafthttp: add 3.4.0,3.5.0 stream type #11274

Merged
merged 1 commit into from
Oct 21, 2019

Conversation

YoyinZyc
Copy link
Contributor

Fix #11264
Basically, the bug is due to the failure of checkStreamSupport. We need to add stream support to 3.4 and 3.5.

if compareMajorMinorVersion(rv, lv) == -1 && !checkStreamSupport(rv, t) {

@YoyinZyc
Copy link
Contributor Author

@gyuho

@YoyinZyc
Copy link
Contributor Author

cc @wenjiaswe @jingyih

@wenjiaswe
Copy link
Contributor

@YoyinZyc thanks for fixing! So the recently cut v3.4.2 missed the supportedStream, would you also please add there as well?

"3.3.0": {streamTypeMsgAppV2, streamTypeMessage},

I will wait for a new 3.4 release then upgrade etcd to the new release: kubernetes/kubernetes#83987

@YoyinZyc
Copy link
Contributor Author

Yuchen Zhou thanks for fixing! So the recently cut v3.4.2 missed the supportedStream, would you also please add there as well?

"3.3.0": {streamTypeMsgAppV2, streamTypeMessage},

I will wait for a new 3.4 release then upgrade etcd to the new release: kubernetes/kubernetes#83987

I added it to 3.4 in another pr #11275

Copy link
Contributor

@gyuho gyuho left a comment

Choose a reason for hiding this comment

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

lgtm. good catch!

@@ -57,6 +57,8 @@ var (
"3.1.0": {streamTypeMsgAppV2, streamTypeMessage},
"3.2.0": {streamTypeMsgAppV2, streamTypeMessage},
"3.3.0": {streamTypeMsgAppV2, streamTypeMessage},
"3.4.0": {streamTypeMsgAppV2, streamTypeMessage},
"3.5.0": {streamTypeMsgAppV2, streamTypeMessage},
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's write a test that fails if there is not entry in this map for the current etcd major version on master.

Copy link
Contributor

Choose a reason for hiding this comment

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

That way it's impossible to forget to update this and have a passing build.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

SGTM

@jingyih
Copy link
Contributor

jingyih commented Oct 21, 2019

LGTM

@jingyih
Copy link
Contributor

jingyih commented Oct 21, 2019

Test was added in #11279. I am merging this so the test can pass after rebase.

@jingyih jingyih merged commit 5dc12f2 into etcd-io:master Oct 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Cannot upgrade cluster from 3.4 to 3.5.
5 participants