Merge pull request #143 from prometheus/julius-fix-drain

Stop serving tiered storage after draining it.

storage/metric/tiered.go

@@ -179,7 +179,7 @@ func (t *tieredStorage) Serve() {
 		case drainingDone := <-t.draining:
 			t.flush()
 			drainingDone <- true
-			break
+			return
 		}
 	}
 }

storage/metric/tiered_test.go

@@ -370,7 +370,6 @@ func testMakeView(t test.Tester) {
 
 	for i, scenario := range scenarios {
 		tiered, closer := newTestTieredStorage(t)
-		defer closer.Close()
 
 		for j, datum := range scenario.data {
 			err := tiered.AppendSample(datum)
@@ -418,7 +417,7 @@ func testMakeView(t test.Tester) {
 			}
 		}
 
-		tiered.Drain()
+		closer.Close()
 	}
 }