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.

Sign up for GitHub

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

Jump to bottom

Fix deadlock in tsm1/file_store #6277

Merged
merged 2 commits into from
Apr 12, 2016
Merged

Fix deadlock in tsm1/file_store #6277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29b19a2
Fix deadlock in tsm1/file_store
PierreF Apr 11, 2016
d4668af
Updated changelog
PierreF Apr 11, 2016
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
- [#6283](https://github.com/influxdata/influxdb/pull/6283): Fix GROUP BY tag to produce consistent results when a series has no tags.
- [#3773](https://github.com/influxdata/influxdb/issues/3773): Support empty tags for all WHERE equality operations.
- [#6270](https://github.com/influxdata/influxdb/issues/6270): tsm1 query engine alloc reduction
- [#6271](https://github.com/influxdata/influxdb/issues/6271): Fixed deadlock in tsm1 file store.

## v0.12.0 [2016-04-05]
### Release Notes
Expand Down
4 changes: 2 additions & 2 deletions tsdb/engine/tsm1/file_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,15 +514,14 @@ func (f *FileStore) BlockCount(path string, idx int) int {

// locations returns the files and index blocks for a key and time. ascending indicates
// whether the key will be scan in ascending time order or descenging time order.
// This function assumes the read-lock has been taken.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add this same comment to newKeyCursor?

func (f *FileStore) locations(key string, t int64, ascending bool) []location {
var locations []location

f.mu.RLock()
filesSnapshot := make([]TSMFile, len(f.files))
for i := range f.files {
filesSnapshot[i] = f.files[i]
}
f.mu.RUnlock()

var entries []IndexEntry
for _, fd := range filesSnapshot {
Expand Down Expand Up @@ -617,6 +616,7 @@ type location struct {
}

// newKeyCursor returns a new instance of KeyCursor.
// This function assumes the read-lock has been taken.
func newKeyCursor(fs *FileStore, key string, t int64, ascending bool) *KeyCursor {
c := &KeyCursor{
key: key,
Expand Down