Initial search functions for the live_store to mirror what ingester does.

modules/ingester/instance_search.go

@@ -1,3 +1,6 @@
+/*
+* ingester is used as the template for livestore/instance_search.go any changes here should be reflected there and vice versa.
+ */
 package ingester
 
 import (

modules/livestore/instance.go

@@ -2,6 +2,7 @@ package livestore
 
 import (
 	"context"
+	"flag"
 	"sync"
 	"time"
 
@@ -29,7 +30,7 @@ type instance struct {
 	enc encoding.VersionedEncoding
 
 	// Block management
-	blocksMtx      sync.Mutex
+	blocksMtx      sync.RWMutex
 	headBlock      common.WALBlock
 	walBlocks      map[uuid.UUID]common.WALBlock
 	completeBlocks map[uuid.UUID]*ingester.LocalBlock
@@ -72,7 +73,7 @@ func newInstance(instanceID string, wal *wal.WAL, overrides Overrides, logger lo
 }
 
 func (i *instance) pushBytes(ts time.Time, req *tempopb.PushBytesRequest) {
-	if len(req.Traces) >= len(req.Ids) {
+	if len(req.Traces) != len(req.Ids) {
 		level.Error(i.logger).Log("msg", "mismatched traces and ids length", "IDs", len(req.Ids), "traces", len(req.Traces))
 		return
 	}
@@ -228,6 +229,13 @@ func (i *instance) cutBlocks(immediate bool) (uuid.UUID, error) {
 	return id, nil
 }
 
+var blockConfig = common.BlockConfig{}
+
+func init() {
+	// TODO MRD this is a hack until we roll the config into the livestore
+	blockConfig.RegisterFlagsAndApplyDefaults("", &flag.FlagSet{})
+}
+
 func (i *instance) completeBlock(ctx context.Context, id uuid.UUID) error {
 	i.blocksMtx.Lock()
 	walBlock := i.walBlocks[id]
@@ -249,7 +257,7 @@ func (i *instance) completeBlock(ctx context.Context, id uuid.UUID) error {
 	}
 	defer iter.Close()
 
-	newMeta, err := i.enc.CreateBlock(ctx, &common.BlockConfig{}, walBlock.BlockMeta(), iter, reader, writer)
+	newMeta, err := i.enc.CreateBlock(ctx, &blockConfig, walBlock.BlockMeta(), iter, reader, writer)
 	if err != nil {
 		level.Error(i.logger).Log("msg", "failed to create complete block", "id", id, "err", err)
 		return err