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

Drop double notification on caasapplicationprovisioner in TestWorker and TestWorkerStatusOnly #15880

Merged
merged 1 commit into from
Jul 10, 2023

Conversation

hpidcock
Copy link
Member

@hpidcock hpidcock commented Jul 7, 2023

Fixes race condition on buffered channel send sometimes notifying twice.

Similar to #15879

QA steps

  • install golang.org/x/tools/cmd/stress@latest
  • cd worker/caasapplicationprovisioner
  • go test -c -race
  • stress ./caasapplicationprovisioner.test

Documentation changes

N/A

Bug reference

https://jenkins.juju.canonical.com/job/github-make-check-juju/7644/consoleText

@hpidcock hpidcock force-pushed the fix-caasapplicationworker-tests-2 branch from fa875b1 to 3293f5a Compare July 9, 2023 22:36
@hpidcock
Copy link
Member Author

hpidcock commented Jul 9, 2023

/merge

@jujubot jujubot merged commit f6a8dae into juju:3.1 Jul 10, 2023
21 of 22 checks passed
@barrettj12 barrettj12 mentioned this pull request Jul 10, 2023
jujubot added a commit that referenced this pull request Jul 10, 2023
#15893

Merges the following patches:
- #15888
- #15877
- #15887
- #15879
- #15880

### Conflicts
None.
@barrettj12 barrettj12 mentioned this pull request Jul 10, 2023
jujubot added a commit that referenced this pull request Jul 11, 2023
@hpidcock hpidcock mentioned this pull request Jul 11, 2023
jujubot added a commit that referenced this pull request Jul 11, 2023
#15896

Forward ports:
- #15845
- #15725
- #15852
- #15854
- #15849
- #15855
- #15857
- #15861
- #15862
- #15860
- #15864
- #15825
- #15866
- #15863
- #15870
- #15871
- #15872
- #15873
- #15874
- #15876
- #15875
- #15881
- #15727
- #15883
- #15884
- #15880
- #15879
- #15886
- #15887
- #15877
- #15888
- #15893
- #15894

Conflicts:
- cmd/juju/ssh/debugcode_test.go
- cmd/juju/ssh/debughooks_test.go
- cmd/juju/ssh/scp_unix_test.go
- cmd/juju/ssh/ssh_machine.go
- cmd/juju/ssh/ssh_machine_test.go
- cmd/juju/ssh/ssh_unix_test.go
- worker/dbaccessor/worker.go
- caas/kubernetes/provider/k8s_test.go
- caas/kubernetes/provider/operator_test.go
- caas/kubernetes/provider/package_test.go
- caas/kubernetes/provider/rbac.go
- cmd/juju/application/deployer/bundlehandler.go
- cmd/juju/application/deployer/bundlehandler_test.go
- cmd/jujud/agent/model/manifolds.go
- core/bundle/changes/changes.go
- worker/caasapplicationprovisioner/application.go
- worker/caasapplicationprovisioner/application_test.go
- worker/caasapplicationprovisioner/mock_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants