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

Backport arm fixes #6622

Merged
merged 3 commits into from
Oct 11, 2016
Merged

Backport arm fixes #6622

merged 3 commits into from
Oct 11, 2016

Conversation

luxas
Copy link
Contributor

@luxas luxas commented Oct 11, 2016

Backport #5890 to the release-3.0 branch for inclusion in 3.0.13

ref: kubernetes/kubernetes#32361

This is required for arm to function properly on the 3.0.x branch which Kubernetes probably will use in v1.5

It's very very low risk, so it should be straightforward to merge this

@gyuho @xiang90 @hongchaodeng @lavalamp @wojtek-t @jaredeh

The relevant structures are properly aligned, however, there is no comment
highlighting the need to keep it aligned as is present elsewhere in the
codebase.

Adding note to keep alignment, in line with similar comments in the codebase.
The Entry struct has misaligned fields that are accessed atomically.  The
misalignment is caused by the EntryType enum which the Protocol Buffers
spec forces to be a 32bit int.

Moving the order of the fields without renumbering them in the .proto file
seems to align the go structure without changing the wire format.
Most fields accessed with sync/atomic functions are 64bit aligned, but a couple
are not.  This makes comments out of date and therefore misleading.

Affected fields reordered, comments scrubbed and updated.
@heyitsanthony
Copy link
Contributor

lgtm; ci errors are unrelated

@gyuho
Copy link
Contributor

gyuho commented Oct 11, 2016

lgtm. It's minor change with low-risk.

@gyuho gyuho merged commit fcbada7 into etcd-io:release-3.0 Oct 11, 2016
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.

4 participants