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 of fix: NET-1521 show latest config in /v1/agent/self into release/1.14.x #18711

Conversation

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

Backport

This PR is auto-generated from #18681 to be assessed for backporting due to the inclusion of the label backport/1.14.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@nvanthao
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

This PR is to fix issue NET-1521 where /v1/agent/self currently not reflecting latest reloadable config

Before the PR, updating reloadable config and run consul reload, the API still show old original config

Original config

bootstrap   = true
server      = true
data_dir    = "/tmp/server"
log_level   = "WARN"
bind_addr   = "127.0.0.1"
client_addr = "127.0.0.1"
raft_snapshot_threshold = 500

Updated config

bootstrap   = true
server      = true
data_dir    = "/tmp/server"
log_level   = "DEBUG"
bind_addr   = "127.0.0.1"
client_addr = "127.0.0.1"
raft_snapshot_threshold = 1000

$ consul reload
Configuration reload triggered

Before the PR

$ curl -s 0:8500/v1/agent/self\?pretty | grep LogLevel
            "LogLevel": "WARN",

$ curl -s 0:8500/v1/agent/self\?pretty | grep RaftSnapshotThreshold
        "RaftSnapshotThreshold": 500,

After the PR

$ curl -s 0:8500/v1/agent/self\?pretty | grep LogLevel
            "LogLevel": "DEBUG",
$ curl -s 0:8500/v1/agent/self\?pretty | grep RaftSnapshotThreshold
        "RaftSnapshotThreshold": 1000,

Testing & Reproduction steps

I have tested the changes manually with above config. However, my unit test is not passing. It will be great if someone could help me with guidance on improving the unit test.

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hashicorp-cla
Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging September 7, 2023 23:48 Inactive
Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul September 7, 2023 23:59 Inactive
@nvanthao
Copy link
Contributor

nvanthao commented Sep 8, 2023

Closing issue as backport is manually created

@nvanthao nvanthao closed this Sep 8, 2023
@nvanthao nvanthao deleted the backport/NET-1521/merely-faithful-ostrich branch September 8, 2023 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants