luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #10348 from hashicorp/dnephin/fix-submatview-store-bug 

submatview: fix a bug with Store.Get
This commit is contained in:
Daniel Nephin 2021-06-04 12:04:29 -04:00 committed by GitHub
parent 65b8929acf 4fb6c5a137
commit 1766aa8a84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/submatview/store.go
View File

@ -118,8 +118,11 @@ func (s *Store) Get(ctx context.Context, req Request) (Result, error) {
} }
defer s.releaseEntry(key) defer s.releaseEntry(key)
ctx, cancel := context.WithTimeout(ctx, info.Timeout) if info.Timeout > 0 {
defer cancel() var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, info.Timeout)
defer cancel()
}
result, err := materializer.getFromView(ctx, info.MinIndex) result, err := materializer.getFromView(ctx, info.MinIndex)
// context.DeadlineExceeded is translated to nil to match the timeout // context.DeadlineExceeded is translated to nil to match the timeout

1
agent/submatview/store_test.go
View File

@ -160,7 +160,6 @@ func (r *fakeRequest) CacheInfo() cache.RequestInfo {
Key: key, Key: key,
Token: "abcd", Token: "abcd",
Datacenter: "dc1", Datacenter: "dc1",
Timeout: 4 * time.Second,
MinIndex: r.index, MinIndex: r.index,
} }
} }