2.2 into develop #7868
Merged
2.2 into develop #7868
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
CI: Merge acceptance tests changes from develop. This merges the acceptancetests changes that happened in develop branch. This is needed as we will be doing in-tree testing in the very near future.
This addresses both bug #1699678 (use bit set operations) and bug We switch from using bulk.Run() which doesn't handle E11000 to just directly calling collection.Upsert() which automatically handles Upsert duplicate key failures. We also ensure it is absolutely safe to retry by switching from $inc operations to using $bit...or operations. Tests still pass. I tried writing a test that would trigger the issue, but even with 1000 concurrent PingBatcher I could not get them to race against Mongo. In the field it seems to only happen when mongo is starting to fail under load for other reasons.
…99678 Switch to directly bit setting instead of $inc for PingBatcher. ## Description of change This addresses both bug #1699678 (use bit set operations) and bug #1703675 (handle upsert failing with duplicate keys). We switch from using bulk.Run() which doesn't handle E11000 to just directly calling collection.Upsert() which automatically handles Upsert duplicate key failures. We also ensure it is absolutely safe to retry by switching from $inc operations to using $bit...or operations. Tests still pass. I tried writing a test that would trigger the issue, but even with 1000 concurrent PingBatcher I could not get them to race against Mongo. In the field it seems to only happen when mongo is starting to fail under load for other reasons. Also addresses bug #1718340 which is just that we were passing a lot of empty document IDs to a query. ## QA steps Run an HA controller. Trigger a lot of load on the controller, and you should not see errors and PingBatcher getting restarted. ## Documentation changes No ## Bug reference [lp:1703675](https://bugs.launchpad.net/juju/+bug/1703675) [lp:1699678](https://bugs.launchpad.net/juju/+bug/1699678) [lp:1718340](https://bugs.launchpad.net/juju/+bug/1718340)
|
|
|
Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju |
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.
Description of change
This brings 2.2 tip back into develop. Mostly bringing in the PingBatcher changes.