fix merge conflict and flaky unit test

Signed-off-by: Yi Jin <[email protected]>

Author: jnyi

pkg/receive/handler_test.go

@@ -1877,7 +1877,7 @@ func TestIngestorRestart(t *testing.T) {
 		},
 	}
 
-	err = client.handleRequest(ctx, 0, "test", data)
+	_, err = client.handleRequest(ctx, 0, "test", data)
 	require.NoError(t, err)
 
 	// close srv2 to simulate ingestor down
@@ -1889,7 +1889,7 @@ func TestIngestorRestart(t *testing.T) {
 
 	iter, errs := 10, 0
 	for i := 0; i < iter; i++ {
-		err = client.handleRequest(ctx, 0, "test", data)
+		_, err = client.handleRequest(ctx, 0, "test", data)
 		if err != nil {
 			require.Error(t, errUnavailable, err)
 			errs++

pkg/receive/multitsdb.go

@@ -636,7 +636,7 @@ func (t *MultiTSDB) startTSDB(logger log.Logger, tenantID string, tenant *tenant
 	opts.EnableOverlappingCompaction = false
 	s, err := tsdb.Open(
 		dataDir,
-		logger,
+		level.NewFilter(logger, level.AllowError()),
 		reg,
 		&opts,
 		nil,

pkg/store/bucket_test.go

@@ -694,7 +694,11 @@ func TestBucketStore_TSDBInfo(t *testing.T) {
 	defer func() { testutil.Ok(t, bucketStore.Close()) }()
 
 	testutil.Ok(t, bucketStore.SyncBlocks(ctx))
-	testutil.Equals(t, bucketStore.TSDBInfos(), []infopb.TSDBInfo{
+	actual := bucketStore.TSDBInfos()
+	sort.Slice(actual, func(i, j int) bool {
+		return actual[i].Labels.String() < actual[j].Labels.String()
+	})
+	testutil.Equals(t, []infopb.TSDBInfo{
 		{
 			Labels:  labelpb.ZLabelSet{Labels: []labelpb.ZLabel{{Name: "a", Value: "b"}}},
 			MinTime: 0,
@@ -710,7 +714,7 @@ func TestBucketStore_TSDBInfo(t *testing.T) {
 			MinTime: 0,
 			MaxTime: 2000,
 		},
-	})
+	}, actual)
 }
 
 func TestBucketStore_Info(t *testing.T) {