Merge pull request #10050 from influxdata/jgm-delete-regex

Resolve deadlock deleting from many measurements concurrently
pull/10058/head
Jacob Marble 2018-07-08 17:01:33 -07:00 committed by GitHub
commit b7d5e2ecdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 304 additions and 297 deletions

File diff suppressed because it is too large Load Diff

View File

@ -308,12 +308,13 @@ func (s *Shard) Open() error {
return err
}
idx.WithLogger(s.baseLogger)
// Open index.
if err := idx.Open(); err != nil {
return err
}
s.index = idx
idx.WithLogger(s.baseLogger)
// Initialize underlying engine.
e, err := NewEngine(s.id, idx, s.path, s.walPath, s.sfile, s.options)