Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

exported UnloadIndex checks for ready state

pull/8790/head
Stuart Carnie 2017-09-05 11:22:13 -07:00
parent 091ea5f9a5
commit 4a6114028c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tsdb/shard.go
View File

@ -112,7 +112,6 @@ type Shard struct {
path string path string
walPath string walPath string
id uint64 id uint64
wg sync.WaitGroup
database string database string
retentionPolicy string retentionPolicy string
@ -350,11 +349,10 @@ func (s *Shard) close(clean bool) error {
default: default:
close(s.closing) close(s.closing)
} }
s.wg.Wait()
if clean { if clean {
// Don't leak our shard ID and series keys in the index // Don't leak our shard ID and series keys in the index
s.UnloadIndex() s.unloadIndex()
} }
err := s.engine.Close() err := s.engine.Close()
@ -403,6 +401,13 @@ func (s *Shard) LastModified() time.Time {
// UnloadIndex removes all references to this shard from the DatabaseIndex // UnloadIndex removes all references to this shard from the DatabaseIndex
func (s *Shard) UnloadIndex() { func (s *Shard) UnloadIndex() {
if err := s.ready(); err != nil {
return
}
s.unloadIndex()
}
func (s *Shard) unloadIndex() {
s.index.RemoveShard(s.id) s.index.RemoveShard(s.id)
} }