fix and support for avro shutdown writer

internal/memorystore/checkpoint.go

@@ -85,20 +85,12 @@ func Checkpointing(wg *sync.WaitGroup, ctx context.Context) {
 			defer wg.Done()
 			d, _ := time.ParseDuration("1m")
 
-			d_cp, err := time.ParseDuration(config.Keys.Checkpoints.Interval)
-			if err != nil {
-				log.Fatal(err)
-			}
-			if d_cp <= 0 {
-				return
-			}
-
 			select {
 			case <-ctx.Done():
 				return
 			case <-time.After(time.Duration(avro.CheckpointBufferMinutes) * time.Minute):
 				// This is the first tick untill we collect the data for given minutes.
-				avro.GetAvroStore().ToCheckpoint(config.Keys.Checkpoints.RootDir)
+				avro.GetAvroStore().ToCheckpoint(config.Keys.Checkpoints.RootDir, false)
 			}
 
 			ticks := func() <-chan time.Time {
@@ -108,22 +100,13 @@ func Checkpointing(wg *sync.WaitGroup, ctx context.Context) {
 				return time.NewTicker(d).C
 			}()
 
-			ticks_cp := func() <-chan time.Time {
-				if d_cp <= 0 {
-					return nil
-				}
-				return time.NewTicker(d_cp).C
-			}()
-
 			for {
 				select {
 				case <-ctx.Done():
 					return
-				case <-ticks_cp:
-					lastCheckpoint = time.Now()
 				case <-ticks:
 					// Regular ticks of 1 minute to write data.
-					avro.GetAvroStore().ToCheckpoint(config.Keys.Checkpoints.RootDir)
+					avro.GetAvroStore().ToCheckpoint(config.Keys.Checkpoints.RootDir, false)
 				}
 			}
 		}()

internal/memorystore/memorystore.go

@@ -8,6 +8,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ClusterCockpit/cc-metric-store/internal/avro"
 	"github.com/ClusterCockpit/cc-metric-store/internal/config"
 	"github.com/ClusterCockpit/cc-metric-store/internal/util"
 	"github.com/ClusterCockpit/cc-metric-store/pkg/resampler"
@@ -76,13 +77,22 @@ func GetMemoryStore() *MemoryStore {
 }
 
 func Shutdown() {
-	ms := GetMemoryStore()
 	log.Printf("Writing to '%s'...\n", config.Keys.Checkpoints.RootDir)
-	files, err := ms.ToCheckpoint(config.Keys.Checkpoints.RootDir, lastCheckpoint.Unix(), time.Now().Unix())
+	var files int
+	var err error
+
+	if config.Keys.Checkpoints.FileFormat == "json" {
+		ms := GetMemoryStore()
+		files, err = ms.ToCheckpoint(config.Keys.Checkpoints.RootDir, lastCheckpoint.Unix(), time.Now().Unix())
+	} else {
+		files, err = avro.GetAvroStore().ToCheckpoint(config.Keys.Checkpoints.RootDir, true)
+	}
+
 	if err != nil {
 		log.Printf("Writing checkpoint failed: %s\n", err.Error())
 	}
 	log.Printf("Done! (%d files written)\n", files)
+
 }
 
 func Retention(wg *sync.WaitGroup, ctx context.Context) {