Pass tracker correctly. Add guard code

Signed-off-by: Joe Elliott <number101010@gmail.com>
grafana · Feb 4, 2021 · f853fb2 · f853fb2
1 parent 7584089
commit f853fb2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/tempodb/backend/gcs/gcs.go b/tempodb/backend/gcs/gcs.go
@@ -132,6 +132,10 @@ func (rw *readerWriter) Append(ctx context.Context, name string, blockID uuid.UU
 
 // CloseAppend implements backend.Writer
 func (rw *readerWriter) CloseAppend(_ context.Context, tracker backend.AppendTracker) error {
+	if tracker == nil {
+		return nil
+	}
+
 	w := tracker.(*storage.Writer)
 	return w.Close()
 }

diff --git a/tempodb/backend/local/local.go b/tempodb/backend/local/local.go
@@ -112,6 +112,10 @@ func (rw *readerWriter) Append(ctx context.Context, name string, blockID uuid.UU
 
 // CloseAppend implements backend.Writer
 func (rw *readerWriter) CloseAppend(ctx context.Context, tracker backend.AppendTracker) error {
+	if tracker == nil {
+		return nil
+	}
+
 	var dst *os.File = tracker.(*os.File)
 	return dst.Close()
 }

diff --git a/tempodb/backend/s3/s3.go b/tempodb/backend/s3/s3.go
@@ -226,6 +226,10 @@ func (rw *readerWriter) Append(ctx context.Context, name string, blockID uuid.UU
 
 // CloseAppend implements backend.Writer
 func (rw *readerWriter) CloseAppend(ctx context.Context, tracker backend.AppendTracker) error {
+	if tracker == nil {
+		return nil
+	}
+
 	a := tracker.(appendTracker)
 	completeParts := make([]minio.CompletePart, 0)
 	for _, p := range a.parts {

diff --git a/tempodb/encoding/compactor_block.go b/tempodb/encoding/compactor_block.go
@@ -100,7 +100,7 @@ func (c *CompactorBlock) Complete(ctx context.Context, tracker backend.AppendTra
 	}
 
 	// one final flush
-	_, bytesFlushed, err := c.FlushBuffer(ctx, tracker, w)
+	tracker, bytesFlushed, err := c.FlushBuffer(ctx, tracker, w)
 	if err != nil {
 		return 0, err
 	}