Skip to content
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

Revert "client: defensive against getting stale alloc updates" #8217

Merged
merged 1 commit into from
Jun 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -1938,9 +1938,6 @@ func (c *Client) allocSync() {
// allocUpdates holds the results of receiving updated allocations from the
// servers.
type allocUpdates struct {
// index is index of server store snapshot used for fetching alloc status
index uint64

// pulled is the set of allocations that were downloaded from the servers.
pulled map[string]*structs.Allocation

Expand Down Expand Up @@ -2123,7 +2120,6 @@ OUTER:
filtered: filtered,
pulled: pulledAllocs,
migrateTokens: resp.MigrateTokens,
index: resp.Index,
}

select {
Expand Down
2 changes: 1 addition & 1 deletion client/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func diffAllocs(existing map[string]uint64, allocs *allocUpdates) *diffResult {
_, filtered := allocs.filtered[existID]

// If not updated or filtered, removed
if !pulled && !filtered && allocs.index > existIndex {
if !pulled && !filtered {
result.removed = append(result.removed, existID)
continue
}
Expand Down
Empty file modified vendor/google.golang.org/appengine/internal/regen.sh
100644 → 100755
Empty file.