Remove unnecessary txn watcher started channel/topic #13312
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wallyworld
force-pushed
the
remove-txnwatcher-started
branch
from
24d6588
to
9a94ab2
Compare
wallyworld
force-pushed
the
remove-txnwatcher-started
branch
from
9a94ab2
to
b7c7860
Compare
SimonRichardson
approved these changes
Sep 7, 2021
| @@ -181,9 +177,6 @@ func OpenStatePool(args OpenParams) (_ *StatePool, err error) { | |||
| RestartDelay: time.Second, | |||
| Clock: args.Clock, | |||
| }) | |||
| pool.hubUnsubFn = pool.hub.Subscribe(watcher.TxnWatcherStarting, func(string, interface{}) { | |||
There was a problem hiding this comment.
I suspect this was caused by the fact we weren't catching every location that the unsubscribe could have been called. Either way, I'm happy that we've removed this, as it's not used. Seems like originally it was created because they could.
|
|
Merged
jujubot
added a commit
that referenced
this pull request
Sep 13, 2021
#13329 This PR forward ports 2.9 into develop. The following PRs are included in this port: - Merge pull request #13324 from achilleasa/2.9-add-ovs-integration-test - Merge pull request #13328 from manadart/2.9-assess-series-upgrade - Merge pull request #13327 from wallyworld/azure-tests-fix - Merge pull request #13325 from SimonRichardson/raft-worker-errors - Merge pull request #13274 from SimonRichardson/lxd-network-devices-config-host-name - Merge pull request #13323 from jujubot/increment-to-2.9.15 - Merge pull request #13321 from wallyworld/more-secret-metadata - Merge pull request #13319 from manadart/2.9-bridge-policy - Merge pull request #13320 from SimonRichardson/revert-lxd-changes - Merge pull request #13194 from juanmanuel-tirado/patch-1 - Merge pull request #13318 from hpidcock/fix-1942948 - Merge pull request #13314 from simondeziel/snap-ack - Merge pull request #13297 from achilleasa/2.9-allow-empty-openvswitch-blocks-in-netplan-config - Merge pull request #13317 from jujubot/increment-to-2.9.14 - Merge pull request #13316 from hpidcock/fix-1942948 - Merge pull request #13296 from ycliuhw/fix/registry-oauth2 - Merge pull request #13311 from wallyworld/unitagent-missing-charm - Merge pull request #13315 from wallyworld/lxd-not-found-fix - Merge pull request #13221 from juanmanuel-tirado/status_watch_flag - Merge pull request #13312 from wallyworld/remove-txnwatcher-started - Merge pull request #13309 from kot0dama/fix-instrospection-posix-shell-2.9 The following files had merge conflicts that had to be resolved (please double-check the changes in last commit): - caas/kubernetes/provider/bootstrap_test.go - feature/flags.go - scripts/win-installer/setup.iss - snap/snapcraft.yaml - state/pool.go - version/version.go - worker/uniter/relation/state_test.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As seen in the linked bug, there can be a panic if the txn watcher worker bounces and closes a "watcherStarted" channel twice. However, that channel and associated pubsub topic is unnecessary in the first place, so this PR removes them both.
QA steps
bootstrap and deploy a couple of charms and relate
Bug reference
https://bugs.launchpad.net/juju/+bug/1942421