[JUJU-403] Remove txn watcher wrench #13590
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
reviewed
Jan 6, 2022
| @@ -327,11 +326,6 @@ func (w *TxnWatcher) loop() error { | |||
| logCollection = w.getTxnLogCollection() | |||
| } | |||
| added, err := w.sync(logCollection) | |||
| if wrench.IsActive("txnwatcher", "sync-error") { | |||
There was a problem hiding this comment.
What we could do is augment the check with a cheap logger.IsTraceEnabled() call.
So this allows the wrench to still be turned on when needed to test, but short circuits the filesystem access.
There was a problem hiding this comment.
Agreed. I'll update this patch accordingly.
The following removes the txn watcher wrench. It calls too frequently in production applications. This removes it completely, but I'm not adverse to either creating a controller/model config for enabling wrenches (calling wrench.SetEnable method), similar to the setup for logging config. Alternatively, just throttling the existence of the wench every minute or so. Either way, we just need to back off calling this.
SimonRichardson
force-pushed
the
txnwatcher-wrench
branch
from
a8ef4e9
to
77aeb56
Compare
wallyworld
approved these changes
Jan 7, 2022
|
|
SimonRichardson
changed the title
Merged
jujubot
added a commit
that referenced
this pull request
Jan 13, 2022
#13607 Merge 2.9. 2.9 was updated to use juju-db 4.4 - here we change that to 5.0 #13587 [JUJU-381] Fix test race in RaftLeaseRemoteSuite.TestSetAddress #13588 [JUJU-349] Remove stub sentence from add-machine helper #13570 [JUJU-256] MVP verify app health after controller/model upgrade #13566 [JUJU-338] Drop miscellaneous NewProviderAddress constructors in favour of a functional approach #13589 Update to latest version of Pebble #13591 [JUJU-388] Ensure 'hostname -f' returns juju-assigned hostname on equinix metal #13592 Remove the format2 test charm #13593 The interactive version command doesn't need a controller #13590 [JUJU-403] Remove txn watcher wrench #13594 [JUJU-335] Expand functionality of ProviderAddress #13601 [JUJU-402] Unit machine test fixes for fire-walled env (s390x) #13603 [JUJU-412] Fix racy tests for the CAAS firewaller worker #13604 [JUJU-413] Test Raft queue immediate dispatch instead of 1 batch per operation #13602 [JUJU-106] Add support for mgo scram-sha256 auth; default to mongo 4.4 on bootstrap #13599 [JUJU-396] juju info/find/download run without a controller #13606 [JUJU-418] Fix some intermittent unit test failures #13600 [JUJU-380] Shutdown application worker properly Conflicts were in snap version change, imports, and removed code. ``` # Conflicts: # agent/agent_test.go # api/charmhub/client_test.go # api/charmhub/data.go # caas/kubernetes/provider/bootstrap_test.go # cmd/juju/charmhub/data.go # cmd/juju/charmhub/download.go # cmd/juju/charmhub/download_test.go # cmd/juju/charmhub/find.go # cmd/juju/charmhub/find_test.go # cmd/juju/charmhub/info.go # cmd/juju/charmhub/info_test.go # cmd/juju/charmhub/mocks/api_mock.go # mongo/mongodfinder_test.go # provider/maas/interfaces.go # provider/maas/interfaces_test.go # service/snap/snap_test.go ``` ## QA steps See PRs [JUJU-381]: https://warthogs.atlassian.net/browse/JUJU-381?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-349]: https://warthogs.atlassian.net/browse/JUJU-349?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-256]: https://warthogs.atlassian.net/browse/JUJU-256?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-338]: https://warthogs.atlassian.net/browse/JUJU-338?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-403]: https://warthogs.atlassian.net/browse/JUJU-403?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-335]: https://warthogs.atlassian.net/browse/JUJU-335?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-402]: https://warthogs.atlassian.net/browse/JUJU-402?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-412]: https://warthogs.atlassian.net/browse/JUJU-412?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-413]: https://warthogs.atlassian.net/browse/JUJU-413?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-106]: https://warthogs.atlassian.net/browse/JUJU-106?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-396]: https://warthogs.atlassian.net/browse/JUJU-396?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-388]: https://warthogs.atlassian.net/browse/JUJU-388?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
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.
The following removes the txn watcher wrench. It calls too frequently in
production applications. This removes it completely, but I'm not averse
to either creating a controller/model config for enabling wrenches
(calling wrench.SetEnable method), similar to the setup for logging
config. Alternatively, just throttling the existence of the wench every
minute or so.
Either way, we just need to back off calling this.
@wallyworld thoughts?
QA steps
Test pass.