improving some logs

Signed-off-by: alanprot <[email protected]>

Author: alanprot

go.sum

@@ -1534,7 +1534,7 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
 github.com/opentracing-contrib/go-grpc v0.1.0 h1:9JHDtQXv6UL0tFF8KJB/4ApJgeOcaHp1h07d0PJjESc=
 github.com/opentracing-contrib/go-grpc v0.1.0/go.mod h1:i3/jx/TvJZ/HKidtT4XGIi/NosUEpzS9xjVJctbKZzI=
-github.com/opentracing-contrib/go-stdlib v1.1.0 h1:hSJ8yYaiAO/k2YZUeWJWpQCPE2wRCDtxRnir0gU6wbA=
+github.com/opentracing-contrib/go-stdlib v1.1.0 h1:cZBWc4pA4e65tqTJddbflK435S0tDImj6c9BMvkdUH0=
 github.com/opentracing-contrib/go-stdlib v1.1.0/go.mod h1:S0p+X9p6dcBkoMTL+Qq2VOvxKs9ys5PpYWXWqlCS0bQ=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=

pkg/parquetconverter/converter.go

@@ -179,18 +179,16 @@ func (c *Converter) running(ctx context.Context) error {
 
 				owned, err := c.ownUser(ring, userID)
 				if err != nil {
-					level.Error(userLogger).Log("msg", "failed to check if user is owned by the user", "user", userID, "err", err)
+					level.Error(userLogger).Log("msg", "failed to check if user is owned by the user", "err", err)
 					continue
 				}
 				if !owned {
-					level.Info(userLogger).Log("msg", "user not owned", "user", userID)
 					continue
 				}
-				level.Info(userLogger).Log("msg", "scanned user", "user", userID)
 
 				err = c.convertUser(ctx, userLogger, ring, userID)
 				if err != nil {
-					level.Error(userLogger).Log("msg", "failed to convert user", "user", userID, "err", err)
+					level.Error(userLogger).Log("msg", "failed to convert user", "err", err)
 				}
 			}
 		}
@@ -217,6 +215,8 @@ func (c *Converter) discoverUsers(ctx context.Context) ([]string, error) {
 }
 
 func (c *Converter) convertUser(ctx context.Context, logger log.Logger, ring ring.ReadRing, userID string) error {
+	level.Info(logger).Log("msg", "start converting user")
+
 	uBucket := bucket.NewUserBucketClient(userID, c.bkt, c.limits)
 
 	var blockLister block.Lister
@@ -290,6 +290,7 @@ func (c *Converter) convertUser(ctx context.Context, logger log.Logger, ring rin
 
 		if err := os.RemoveAll(c.compactRootDir()); err != nil {
 			level.Error(logger).Log("msg", "failed to remove work directory", "path", c.compactRootDir(), "err", err)
+			continue
 		}
 
 		bdir := filepath.Join(c.compactDirForUser(userID), b.ULID.String())

pkg/parquetconverter/converter_ring.go

@@ -5,12 +5,12 @@ import (
 	"os"
 	"time"
 
-	"github.com/cortexproject/cortex/pkg/ring"
-	"github.com/cortexproject/cortex/pkg/util/flagext"
-	util_log "github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/go-kit/log/level"
 
+	"github.com/cortexproject/cortex/pkg/ring"
 	"github.com/cortexproject/cortex/pkg/ring/kv"
+	"github.com/cortexproject/cortex/pkg/util/flagext"
+	util_log "github.com/cortexproject/cortex/pkg/util/log"
 )
 
 type RingConfig struct {

pkg/parquetconverter/converter_test.go

@@ -7,6 +7,17 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-kit/log"
+	"github.com/oklog/ulid"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/tsdb"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/thanos-io/objstore"
+	"github.com/thanos-io/thanos/pkg/block"
+	"github.com/thanos-io/thanos/pkg/block/metadata"
+
 	"github.com/cortexproject/cortex/integration/e2e"
 	"github.com/cortexproject/cortex/pkg/ring"
 	"github.com/cortexproject/cortex/pkg/ring/kv/consul"
@@ -18,16 +29,6 @@ import (
 	"github.com/cortexproject/cortex/pkg/util/services"
 	"github.com/cortexproject/cortex/pkg/util/test"
 	"github.com/cortexproject/cortex/pkg/util/validation"
-	"github.com/go-kit/log"
-	"github.com/oklog/ulid"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/prometheus/model/labels"
-	"github.com/prometheus/prometheus/tsdb"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/thanos-io/objstore"
-	"github.com/thanos-io/thanos/pkg/block"
-	"github.com/thanos-io/thanos/pkg/block/metadata"
 )
 
 func TestConverter(t *testing.T) {
@@ -37,7 +38,7 @@ func TestConverter(t *testing.T) {
 	t.Cleanup(func() { assert.NoError(t, closer.Close()) })
 	dir := t.TempDir()
 
-	cfg.Ring.InstanceID = "compactor-1"
+	cfg.Ring.InstanceID = "parquet-converter-1"
 	cfg.Ring.InstanceAddr = "1.2.3.4"
 	cfg.Ring.KVStore.Mock = ringStore
 	bucketClient := objstore.NewInMemBucket()
@@ -73,6 +74,7 @@ func TestConverter(t *testing.T) {
 	// Try to start the compactor with a bad consul kv-store. The
 	err := services.StartAndAwaitRunning(context.Background(), c)
 	require.NoError(t, err)
+	defer services.StopAndAwaitTerminated(ctx, c) // nolint:errcheck
 
 	blocksConverted := []ulid.ULID{}
 

pkg/storage/tsdb/bucketindex/markers.go

@@ -3,7 +3,6 @@ package bucketindex
 import (
 	"context"
 	"fmt"
-	"github.com/cortexproject/cortex/pkg/storage/parquet"
 	"path"
 	"path/filepath"
 	"strings"
@@ -16,6 +15,7 @@ import (
 	"github.com/thanos-io/thanos/pkg/block/metadata"
 
 	"github.com/cortexproject/cortex/pkg/storage/bucket"
+	"github.com/cortexproject/cortex/pkg/storage/parquet"
 )
 
 const (