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

External controller log message #17422

Merged
merged 1 commit into from
May 29, 2024

Conversation

SimonRichardson
Copy link
Member

@SimonRichardson SimonRichardson commented May 24, 2024

Whilst debugging a production issue, we saw the log line that controller info was updated, but we don't know what it went from and to. As this happened a lot, it would be helpful to better understand why we're constantly getting a new set of addresses.

Neither the cert or the alias are updated when we get new information, so it doesn't make sense to keep spitting them out. Just the addresses are enough to get an idea of the churn.

Checklist

  • Code style: imports ordered, good names, simple structure, etc
  • Comments saying why design decisions were made
  • Go unit tests, with comments saying what you're testing

QA steps

$ juju bootstrap lxd test
$ juju add-model default
$ juju deploy ubuntu
$ juju enable-ha

You should see the line about the controller info being updated.

Links

Jira card: JUJU-

Whilst debugging a production issue, we saw the log line that
controller info was updated, but we don't know what it went from
and to. As this happened a lot, it would be helpful to better
understand why we're constantly getting a new set of addresses.

Neither the cert or the alias are updated when we get new information,
so it doesn't make sense to keep spitting them out. Just the addresses
are enough to get an idea of the churn.
Copy link

@ukane-philemon ukane-philemon left a comment

Choose a reason for hiding this comment

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

LGTM

@hpidcock
Copy link
Member

/build

@hpidcock
Copy link
Member

/merge

@jujubot jujubot merged commit 73cf4a0 into juju:3.4 May 29, 2024
22 of 23 checks passed
@Aflynn50 Aflynn50 mentioned this pull request May 31, 2024
jujubot added a commit that referenced this pull request May 31, 2024
#17458

Merge from 3.4 to 3.5 with no conflicts.

This merge includes the following PRs:
- #17440 from jack-w-shaw
- #17453 from hpidcock
- #17444 from Aflynn50
- #17448 from hpidcock
- #17446 from wallyworld
- #17422 from SimonRichardson
- #17436 from hpidcock
 - #17348 from jack-w-shaw
@jack-w-shaw jack-w-shaw mentioned this pull request Jun 3, 2024
jujubot added a commit that referenced this pull request Jun 3, 2024
#17461

Forward merge:
- #17348
- #17413
- #17423
- #17436
- #17422
- #17446
- #17448
- #17444
- #17453
- #17440
- #17458

Conflicts:
- acceptancetests/jujupy/client.py
- acceptancetests/jujupy/tests/test_status.py
- acceptancetests/repository/trusty/haproxy/cm.py
- acceptancetests/tests/test_jujucharm.py
- cmd/juju/cloud/addcredential.go
- core/base/base.go
- environs/bootstrap/bootstrap.go
- provider/azure/environ.go
- provider/azure/internal/imageutils/images.go
- scripts/win-installer/setup.iss
- snap/snapcraft.yaml
- version/version.go

Conflicts mostly trivial

`provider/azure/internal/imageutils/images.go` took a bit of thought. This conflict resulted from my PR #17440
@jack-w-shaw jack-w-shaw mentioned this pull request Jun 6, 2024
jujubot added a commit that referenced this pull request Jun 7, 2024
#17479

Forward merge:
- #17348
- #17413
- #17423
- #17436
- #17336
- #17422
- #17446
- #17448
- #17444
- #17453
- #17440
- #17458
- #17454
- #17461
- #17462
- #17463
- #17465
- #17469
- #17144
- #17179
- #17464
- #17476
- #17477

Conflicts:
- cmd/juju/application/bundle/bundle.go
- cmd/juju/application/bundle/bundle_test.go
- cmd/juju/application/deploy.go
- cmd/juju/application/deploy_test.go
- cmd/juju/commands/bootstrap.go
- cmd/juju/machine/add.go
- cmd/jujud-controller/agent/machine.go
- cmd/jujud/agent/machine.go
- go.mod
- go.sum
- internal/bundle/changes/changes.go
- internal/container/utils.go
- internal/container/utils_test.go
- internal/provider/azure/environ.go
- internal/provider/azure/internal/errorutils/errors_test.go
- internal/provider/azure/internal/imageutils/images.go
- internal/provider/azure/internal/imageutils/images_test.go
- internal/worker/containerbroker/broker_test.go
- internal/worker/uniter/runner/context/context.go
- internal/worker/uniter/runner/context/contextfactory.go
- internal/worker/uniter/runner/context/export_test.go
- internal/worker/uniter/runner/jujuc/relation-ids.go
- tests/includes/juju.sh
- tests/main.sh
- tests/suites/deploy/os.sh

Most conflicts were trivial to solve. Azure conflicts took a bit of thought. They emerged from [my PR](#17440)

The conflicts to `internal/worker/uniter/runner`, emerging from [this PR](#17464), took some thought, since the structure of tests had changed to mocks. The conflicts with the production code here, however, was trivial to merge
@SimonRichardson SimonRichardson deleted the external-controller-log-message branch October 25, 2024 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants