-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix panic occuring from improper bitmap size #3023
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -264,7 +264,7 @@ func newAllocNameIndex(job, taskGroup string, count int, in allocSet) *allocName | |
|
||
// bitmapFrom creates a bitmap from the given allocation set and a minimum size | ||
// maybe given. The size of the bitmap is as the larger of the passed minimum | ||
// and t the maximum alloc index of the passed input (byte aligned). | ||
// and the maximum alloc index of the passed input (byte alligned). | ||
func bitmapFrom(input allocSet, minSize uint) structs.Bitmap { | ||
var max uint | ||
for _, a := range input { | ||
|
@@ -276,9 +276,16 @@ func bitmapFrom(input allocSet, minSize uint) structs.Bitmap { | |
if l := uint(len(input)); minSize < l { | ||
minSize = l | ||
} | ||
|
||
if max < minSize { | ||
max = minSize | ||
} else if max > minSize && max%8 == 0 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why doesn't this apply when |
||
// This may be possible if the job was scaled down. We want to make sure | ||
// that the max index is not byte-alligned otherwise we will overflow | ||
// the bitmap. | ||
max++ | ||
} | ||
|
||
if max == 0 { | ||
max = 8 | ||
} | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
package scheduler | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/hashicorp/nomad/nomad/structs" | ||
) | ||
|
||
// Test that we properly create the bitmap even when the alloc set includes an | ||
// allocation with a higher count than the current min count and it is byte | ||
// alligned. | ||
// Ensure no regerssion from: https://github.com/hashicorp/nomad/issues/3008 | ||
func TestBitmapFrom(t *testing.T) { | ||
input := map[string]*structs.Allocation{ | ||
"8": { | ||
JobID: "foo", | ||
TaskGroup: "bar", | ||
Name: "foo.bar[8]", | ||
}, | ||
} | ||
b := bitmapFrom(input, 1) | ||
exp := uint(16) | ||
if act := b.Size(); act != exp { | ||
t.Fatalf("got %d; want %d", act, exp) | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You spelled aligned right the first time :)