Handle if collStats returns an int64 for size. #9159
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
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.
SimonRichardson
approved these changes
Sep 4, 2018
| // 2billion megabytes is 2 petabytes, which is outside our range anyway. | ||
| if asint64 > math.MaxInt32 { | ||
| return math.MaxInt32, nil | ||
| } |
There was a problem hiding this comment.
Is there ever a case that asint64 < 0 so that we also handle the min case or math.MinInt32 case?
There was a problem hiding this comment.
Well, if mongo returns a negative number of megabytes for the size of a collection we certainly have issues. I'm ok handling that case, just in a belt-and-suspenders type of defensive programming. But I'd probably cap the threshold at 0. Cause a negative size would do really weird things.
Treat them as errors rather than just passing them through.
|
|
Merged
jujubot
added a commit
that referenced
this pull request
Sep 6, 2018
#9169 ## Description of change Merge 2.3 into 2.4, bringing in: prdesc Merge pull request #9159 from jameinel/2.3-collection-size-1790626 ## QA steps See individual patches. ## Documentation changes None. ## Bug reference prdesc https://bugs.launchpad.net/juju/+bug/1790626
Merged
jujubot
added a commit
that referenced
this pull request
Oct 11, 2018
#9299 ## Description of change Merge 2.4 into develop, picking up these PRs: #9287 container networking, manually provisioned machines #9296 more robust cmr controller connectivity #9251 Fix the exporting of the series of the application when exporting a bundle #9293 bundle deploy panic #9285 tomb.Go shouldn't be called multiple times from a non-tomb managed goroutine #9263 Add back the state of each unit in a relation to goal state #9235 handle maas partitions in a storage constraint #9191 Add a default retry inside 'juju status' #9177 latest ec2 instance types #9180 fix space check before upgrade #9159 mongo collection size ## QA steps bootstrap smoke test
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
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