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

server: ensure that central service config flattening properly resets the state each time #10239

Merged
merged 2 commits into from
May 14, 2021

Conversation

rboyer
Copy link
Member

@rboyer rboyer commented May 13, 2021

The prior solution to call reply.Reset() aged poorly since newer fields
were added to the reply, but not added to Reset() leading serial
blocking query loops on the server to blend replies.

This could manifest as a service-defaults protocol change from
default=>http not reverting back to default after the config entry
reponsible was deleted.

… the state each time

The prior solution to call reply.Reset() aged poorly since newer fields
were added to the reply, but not added to Reset() leading serial
blocking query loops on the server to blend replies.

This could manifest as a service-defaults protocol change from
default=>http not reverting back to default after the config entry
reponsible was deleted.
@rboyer rboyer added type/bug Feature does not function as expected backport/1.8 labels May 13, 2021
@rboyer rboyer requested a review from a team May 13, 2021 19:53
@rboyer rboyer self-assigned this May 13, 2021
@vercel vercel bot temporarily deployed to Preview – consul May 13, 2021 19:56 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 13, 2021 19:56 Inactive
Copy link
Contributor

@markan markan left a comment

Choose a reason for hiding this comment

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

This looks reasonable.

I'm a little sad at the demise of Reset, (because I would love to see a little more encapsulation and factoring out of common code) but here it was only used once so shrug.

@rboyer rboyer merged commit 597448d into master May 14, 2021
@rboyer rboyer deleted the fix-central-service-reg branch May 14, 2021 15:21
@hc-github-team-consul-core
Copy link
Collaborator

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/369168.

@hc-github-team-consul-core
Copy link
Collaborator

🍒✅ Cherry pick of commit 597448d onto release/1.10.x succeeded!

hc-github-team-consul-core pushed a commit that referenced this pull request May 14, 2021
… the state each time (#10239)

The prior solution to call reply.Reset() aged poorly since newer fields
were added to the reply, but not added to Reset() leading serial
blocking query loops on the server to blend replies.

This could manifest as a service-defaults protocol change from
default=>http not reverting back to default after the config entry
reponsible was deleted.
@hc-github-team-consul-core
Copy link
Collaborator

🍒❌ Cherry pick of commit 597448d onto release/1.9.x failed! Build Log

@hc-github-team-consul-core
Copy link
Collaborator

🍒❌ Cherry pick of commit 597448d onto release/1.8.x failed! Build Log

rboyer added a commit that referenced this pull request May 14, 2021
… the state each time (#10239)

The prior solution to call reply.Reset() aged poorly since newer fields
were added to the reply, but not added to Reset() leading serial
blocking query loops on the server to blend replies.

This could manifest as a service-defaults protocol change from
default=>http not reverting back to default after the config entry
reponsible was deleted.

Backport of #10239 to 1.9.x
rboyer added a commit that referenced this pull request May 14, 2021
… the state each time (#10245)

The prior solution to call reply.Reset() aged poorly since newer fields
were added to the reply, but not added to Reset() leading serial
blocking query loops on the server to blend replies.

This could manifest as a service-defaults protocol change from
default=>http not reverting back to default after the config entry
reponsible was deleted.

Backport of #10239 to 1.9.x
hc-github-team-consul-core pushed a commit that referenced this pull request May 14, 2021
… the state each time (#10245)

The prior solution to call reply.Reset() aged poorly since newer fields
were added to the reply, but not added to Reset() leading serial
blocking query loops on the server to blend replies.

This could manifest as a service-defaults protocol change from
default=>http not reverting back to default after the config entry
reponsible was deleted.

Backport of #10239 to 1.9.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/bug Feature does not function as expected
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants