Merge branch '0.9.3' of https://github.com/influxdb/influxdb into 0.9.3

cmd/influxd/run/server_test.go

@@ -3026,7 +3026,6 @@ func TestServer_Query_Fill(t *testing.T) {
 }
 
 func TestServer_Query_Chunk(t *testing.T) {
-	t.Skip()
 	t.Parallel()
 	s := OpenServer(NewConfig(), "")
 	defer s.Close()

shared/admin/index.html

@@ -160,7 +160,7 @@ <h3 class="panel-title">Connection Settings</h3>
     <!-- /.container -->
     <div id="footer">
       <div class="container">
-          <p class="text-muted text-right credit"><b>InfluxDB</b> v0.9.2</p>
+          <p class="text-muted text-right credit"><b>InfluxDB</b> v0.9.3</p>
       </div>
     </div>
 

tsdb/engine/bz1/bz1.go

@@ -136,10 +136,12 @@ func (e *Engine) Open() error {
 func (e *Engine) Close() error {
 	e.mu.Lock()
 	defer e.mu.Unlock()
-	if err := e.close(); err != nil {
+
+	if err := e.WAL.Close(); err != nil {
 		return err
 	}
-	return e.WAL.Close()
+
+	return e.close()
 }
 
 func (e *Engine) close() error {

tsdb/engine/wal/wal.go

@@ -230,17 +230,18 @@ func (l *Log) Cursor(key string) tsdb.Cursor {
 }
 
 func (l *Log) WritePoints(points []tsdb.Point, fields map[string]*tsdb.MeasurementFields, series []*tsdb.SeriesCreate) error {
-	partitionsToWrite := l.pointsToPartitions(points)
-
+	// persist the series and fields if there are any
 	if err := l.writeSeriesAndFields(fields, series); err != nil {
 		l.logger.Println("error writing series and fields:", err.Error())
 		return err
 	}
 
-	// get it to disk
+	// persist the raw point data
 	l.mu.RLock()
 	defer l.mu.RUnlock()
 
+	partitionsToWrite := l.pointsToPartitions(points)
+
 	for p, points := range partitionsToWrite {
 		if err := p.Write(points); err != nil {
 			return err
@@ -534,20 +535,27 @@ func (l *Log) openPartitionFiles() error {
 // Close will finish any flush that is currently in process and close file handles
 func (l *Log) Close() error {
 	// stop the autoflushing process so it doesn't try to kick another one off
+	l.mu.Lock()
 	if l.closing != nil {
 		close(l.closing)
 		l.closing = nil
 	}
+	l.mu.Unlock()
 
+	// Allow goroutines to finish running.
 	l.wg.Wait()
 
+	// Lock the remainder of the closing process.
 	l.mu.Lock()
 	defer l.mu.Unlock()
 
 	// clear the cache
-	l.partitions = nil
+	if err := l.close(); err != nil {
+		return err
+	}
 
-	return l.close()
+	l.partitions = nil
+	return nil
 }
 
 // close all the open Log partitions and file handles
@@ -745,6 +753,9 @@ func (p *Partition) Close() error {
 	defer p.mu.Unlock()
 
 	p.cache = nil
+	if p.currentSegmentFile == nil {
+		return nil
+	}
 	if err := p.currentSegmentFile.Close(); err != nil {
 		return err
 	}