Merge 2.3 into 2.4 #9169
Merged
Merge 2.3 into 2.4 #9169
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
Add some testing for how we handle the bson.M result and allow it to be int or int64 and generate an error rather than panic if it isn't.
Treat them as errors rather than just passing them through.
#9159 ## Description of change In production, we ran into panic() because Mongo was returning an int64 for a size field instead of an int. We don't have full understanding of how it was happening, but this should at least cover the issue. Add some testing for how we handle the bson.M result and allow it to be int or int64 and generate an error rather than panic if it isn't. ## QA steps Tests added to cover the new code path which was factored out so that it could be directly testable. We don't have exact reproduction for how to get Mongo to behave in this way. One possibility is to just create a logs table that is very very large (>2GB?) and see if it panics without this change. ## Documentation changes None. ## Bug reference https://bugs.launchpad.net/juju/+bug/1790626
|
|
jameinel
added a commit
to jameinel/juju
that referenced
this pull request
Oct 25, 2018
Including: * Merge pull request juju#9359 from juju/2.3 * Merge pull request juju#9355 from howbazaar/2.4-engine-backoff * Merge pull request juju#9345 from anastasiamac/only-clear-current-when-asked-lp1796148 * Merge pull request juju#9335 from babbageclunk/mux-worker * Merge pull request juju#9333 from wallyworld/merge-2.3-20181018 * Merge pull request juju#9323 from ExternalReality/fix_logging_path * Merge pull request juju#9327 from mitechie/enable-export-bundle * Merge pull request juju#9315 from manadart/2.4-acceptance-maas-network-bind * Merge pull request juju#9300 from manadart/2.4-provisioner-testing-with-mocks * Merge pull request juju#9287 from manadart/2.4 * Merge pull request juju#9297 from anastasiamac/24-better-debug-lp1779677 * Merge pull request juju#9298 from wallyworld/cmr-controller-connect-robust-2.4 * Merge pull request juju#9251 from howbazaar/bundle-export-series * Merge pull request juju#9293 from babbageclunk/bundle-deploy-panic-2.4 * Merge pull request juju#9285 from howbazaar/2.4-fix-multiwatcher * Merge pull request juju#9264 from mitechie/forward-9235 * Merge pull request juju#9263 from wallyworld/goal-state-units * Merge pull request juju#9255 from howbazaar/2.4-bionic-tests * Merge pull request juju#9203 from wallyworld/go-1.11-2.4 * Merge pull request juju#9191 from howbazaar/2.4-status-retry * Merge pull request juju#9178 from hmlanigan/fixes * Merge pull request juju#9177 from SimonRichardson/ec2-instance-types-2.4 * Merge pull request juju#9181 from babbageclunk/2.3-merge-into-2.4 * Merge pull request juju#9169 from juju/2.3 * Merge pull request juju#9167 from babbageclunk/caasfirewaller-test-fix-2.4 * Merge pull request juju#9166 from babbageclunk/s390x-test-fix-2.4 * Merge pull request juju#9152 from jameinel/2.3-into-2.4 * Merge pull request juju#9080 from vinu2003/juju_exportBundle_timeDelayFix * Merge pull request juju#9138 from wallyworld/charm.v6-dep-update * Merge pull request juju#9137 from anastasiamac/test-order-fix-24 * Merge pull request juju#9134 from anastasiamac/merge-23-into-24-20180829 * Merge pull request juju#9132 from wallyworld/improve-charm-versionstring * Merge pull request juju#9126 from anastasiamac/empty-default-settings-lp1789415-24 * Merge pull request juju#9117 from anastasiamac/init-cmd-lp1785205-24 * Merge pull request juju#9104 from wallyworld/merge-2.3-20180823 Bugs * https://bugs.launchpad.net/juju/+bug/1798485 * https://bugs.launchpad.net/juju/+bug/1793245 * https://bugs.launchpad.net/juju/+bug/1796148 * https://bugs.launchpad.net/juju/+bug/1798001 * https://bugs.launchpad.net/juju/+bug/1793284 * https://bugs.launchpad.net/juju/+bug/1796106 * https://bugs.launchpad.net/juju/+bug/1779677 * https://bugs.launchpad.net/juju/+bug/1795499 * https://bugs.launchpad.net/juju/+bug/1773357 * https://bugs.launchpad.net/juju/+bug/1792299 * https://bugs.launchpad.net/juju/+bug/1782803 * https://bugs.launchpad.net/juju/+bug/1782367 * https://bugs.launchpad.net/juju/+bug/1790626 * https://bugs.launchpad.net/juju/+bug/1789211 * https://bugs.launchpad.net/juju/+bug/1789447 * https://bugs.launchpad.net/juju/+bug/1789415 * https://bugs.launchpad.net/juju/+bug/1785205 * https://bugs.launchpad.net/juju/2.3/+bug/1788554
Merged
jujubot
added a commit
that referenced
this pull request
Oct 26, 2018
#9372 ## Description of change Merge of the current tip of 2.4 into 2.5 bringing in patches: prdesc Merge pull request #9359 from juju/2.3 prdesc Merge pull request #9355 from howbazaar/2.4-engine-backoff prdesc Merge pull request #9345 from anastasiamac/only-clear-current-when-asked-lp1796148 prdesc Merge pull request #9335 from babbageclunk/mux-worker prdesc Merge pull request #9333 from wallyworld/merge-2.3-20181018 prdesc Merge pull request #9323 from ExternalReality/fix_logging_path prdesc Merge pull request #9327 from mitechie/enable-export-bundle prdesc Merge pull request #9315 from manadart/2.4-acceptance-maas-network-bind prdesc Merge pull request #9300 from manadart/2.4-provisioner-testing-with-mocks prdesc Merge pull request #9287 from manadart/2.4 prdesc Merge pull request #9297 from anastasiamac/24-better-debug-lp1779677 prdesc Merge pull request #9298 from wallyworld/cmr-controller-connect-robust-2.4 prdesc Merge pull request #9251 from howbazaar/bundle-export-series prdesc Merge pull request #9293 from babbageclunk/bundle-deploy-panic-2.4 prdesc Merge pull request #9285 from howbazaar/2.4-fix-multiwatcher prdesc Merge pull request #9264 from mitechie/forward-9235 prdesc Merge pull request #9263 from wallyworld/goal-state-units prdesc Merge pull request #9255 from howbazaar/2.4-bionic-tests prdesc Merge pull request #9203 from wallyworld/go-1.11-2.4 prdesc Merge pull request #9191 from howbazaar/2.4-status-retry prdesc Merge pull request #9178 from hmlanigan/fixes prdesc Merge pull request #9177 from SimonRichardson/ec2-instance-types-2.4 prdesc Merge pull request #9181 from babbageclunk/2.3-merge-into-2.4 prdesc Merge pull request #9169 from juju/2.3 prdesc Merge pull request #9167 from babbageclunk/caasfirewaller-test-fix-2.4 prdesc Merge pull request #9166 from babbageclunk/s390x-test-fix-2.4 prdesc Merge pull request #9152 from jameinel/2.3-into-2.4 prdesc Merge pull request #9080 from vinu2003/juju_exportBundle_timeDelayFix prdesc Merge pull request #9138 from wallyworld/charm.v6-dep-update prdesc Merge pull request #9137 from anastasiamac/test-order-fix-24 prdesc Merge pull request #9134 from anastasiamac/merge-23-into-24-20180829 prdesc Merge pull request #9132 from wallyworld/improve-charm-versionstring prdesc Merge pull request #9126 from anastasiamac/empty-default-settings-lp1789415-24 prdesc Merge pull request #9117 from anastasiamac/init-cmd-lp1785205-24 prdesc Merge pull request #9104 from wallyworld/merge-2.3-20180823 ## QA steps See individual patches. ## Documentation changes See individual patches. ## Bug reference prdesc https://bugs.launchpad.net/juju/+bug/1798485 prdesc https://bugs.launchpad.net/juju/+bug/1793245 prdesc https://bugs.launchpad.net/juju/+bug/1796148 prdesc https://bugs.launchpad.net/juju/+bug/1798001 prdesc https://bugs.launchpad.net/juju/+bug/1793284 prdesc https://bugs.launchpad.net/juju/+bug/1796106 prdesc https://bugs.launchpad.net/juju/+bug/1779677 prdesc https://bugs.launchpad.net/juju/+bug/1795499 prdesc https://bugs.launchpad.net/juju/+bug/1773357 prdesc https://bugs.launchpad.net/juju/+bug/1792299 prdesc https://bugs.launchpad.net/juju/+bug/1782803 prdesc https://bugs.launchpad.net/juju/+bug/1782367 prdesc https://bugs.launchpad.net/juju/+bug/1790626 prdesc https://bugs.launchpad.net/juju/+bug/1789211 prdesc https://bugs.launchpad.net/juju/+bug/1789447 prdesc https://bugs.launchpad.net/juju/+bug/1789415 prdesc https://bugs.launchpad.net/juju/+bug/1785205 prdesc https://bugs.launchpad.net/juju/2.3/+bug/1788554
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
Merge 2.3 into 2.4, bringing in:
QA steps
See individual patches.
Documentation changes
None.
Bug reference