Skip to content

Commit 2199af9

Browse files
aknuds1alvinlin123
aknuds1
authored and
alvinlin123
committed
Revert "Migrate to dskit/ring (cortexproject#4539)" (cortexproject#4606)
This reverts commit f2656f8. Signed-off-by: Arve Knudsen <[email protected]> Signed-off-by: Alvin Lin <[email protected]>
1 parent 77e5a2b commit 2199af9

File tree

88 files changed

+6724
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+6724
-89
lines changed

‎pkg/alertmanager/alertmanager_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import (
77
"github.com/go-kit/log"
88
"github.com/grafana/dskit/crypto/tls"
99
"github.com/grafana/dskit/grpcclient"
10-
"github.com/grafana/dskit/ring/client"
1110
"github.com/pkg/errors"
1211
"github.com/prometheus/client_golang/prometheus"
1312
"github.com/prometheus/client_golang/prometheus/promauto"
1413
"google.golang.org/grpc"
1514
"google.golang.org/grpc/health/grpc_health_v1"
1615

1716
"github.com/cortexproject/cortex/pkg/alertmanager/alertmanagerpb"
17+
"github.com/cortexproject/cortex/pkg/ring/client"
1818
)
1919

2020
// ClientsPool is the interface used to get the client from the pool for a specified address.

‎pkg/alertmanager/alertmanager_ring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/go-kit/log/level"
1111
"github.com/grafana/dskit/flagext"
1212
"github.com/grafana/dskit/kv"
13-
"github.com/grafana/dskit/ring"
1413

14+
"github.com/cortexproject/cortex/pkg/ring"
1515
util_log "github.com/cortexproject/cortex/pkg/util/log"
1616
)
1717

‎pkg/alertmanager/alertmanager_ring_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import (
44
"testing"
55
"time"
66

7-
"github.com/grafana/dskit/ring"
87
"github.com/stretchr/testify/assert"
8+
9+
"github.com/cortexproject/cortex/pkg/ring"
910
)
1011

1112
func TestIsHealthyForAlertmanagerOperations(t *testing.T) {

‎pkg/alertmanager/distributor.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import (
1212

1313
"github.com/go-kit/log"
1414
"github.com/go-kit/log/level"
15-
"github.com/grafana/dskit/ring"
16-
"github.com/grafana/dskit/ring/client"
1715
"github.com/grafana/dskit/services"
1816
"github.com/opentracing/opentracing-go"
1917
"github.com/pkg/errors"
@@ -22,6 +20,8 @@ import (
2220
"github.com/weaveworks/common/user"
2321

2422
"github.com/cortexproject/cortex/pkg/alertmanager/merger"
23+
"github.com/cortexproject/cortex/pkg/ring"
24+
"github.com/cortexproject/cortex/pkg/ring/client"
2525
"github.com/cortexproject/cortex/pkg/tenant"
2626
"github.com/cortexproject/cortex/pkg/util"
2727
util_log "github.com/cortexproject/cortex/pkg/util/log"

‎pkg/alertmanager/distributor_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/grafana/dskit/flagext"
1818
"github.com/grafana/dskit/kv"
1919
"github.com/grafana/dskit/kv/consul"
20-
"github.com/grafana/dskit/ring"
2120
"github.com/grafana/dskit/services"
2221
"github.com/prometheus/client_golang/prometheus"
2322
"github.com/stretchr/testify/assert"
@@ -28,6 +27,7 @@ import (
2827
"google.golang.org/grpc/health/grpc_health_v1"
2928

3029
"github.com/cortexproject/cortex/pkg/alertmanager/alertmanagerpb"
30+
"github.com/cortexproject/cortex/pkg/ring"
3131
util_log "github.com/cortexproject/cortex/pkg/util/log"
3232
"github.com/cortexproject/cortex/pkg/util/test"
3333
)

‎pkg/alertmanager/lifecycle.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package alertmanager
22

33
import (
4-
"github.com/grafana/dskit/ring"
4+
"github.com/cortexproject/cortex/pkg/ring"
55
)
66

77
func (r *MultitenantAlertmanager) OnRingInstanceRegister(_ *ring.BasicLifecycler, ringDesc ring.Desc, instanceExists bool, instanceID string, instanceDesc ring.InstanceDesc) (ring.InstanceState, ring.Tokens) {

‎pkg/alertmanager/multitenant.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import (
1818
"github.com/grafana/dskit/concurrency"
1919
"github.com/grafana/dskit/flagext"
2020
"github.com/grafana/dskit/kv"
21-
"github.com/grafana/dskit/ring"
22-
"github.com/grafana/dskit/ring/client"
2321
"github.com/grafana/dskit/services"
2422
"github.com/pkg/errors"
2523
"github.com/prometheus/alertmanager/cluster"
@@ -36,6 +34,8 @@ import (
3634
"github.com/cortexproject/cortex/pkg/alertmanager/alertmanagerpb"
3735
"github.com/cortexproject/cortex/pkg/alertmanager/alertspb"
3836
"github.com/cortexproject/cortex/pkg/alertmanager/alertstore"
37+
"github.com/cortexproject/cortex/pkg/ring"
38+
"github.com/cortexproject/cortex/pkg/ring/client"
3939
"github.com/cortexproject/cortex/pkg/tenant"
4040
"github.com/cortexproject/cortex/pkg/util"
4141
util_log "github.com/cortexproject/cortex/pkg/util/log"

‎pkg/alertmanager/multitenant_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/grafana/dskit/concurrency"
2424
"github.com/grafana/dskit/flagext"
2525
"github.com/grafana/dskit/kv/consul"
26-
"github.com/grafana/dskit/ring"
2726
"github.com/grafana/dskit/services"
2827
"github.com/prometheus/alertmanager/cluster/clusterpb"
2928
"github.com/prometheus/alertmanager/notify"
@@ -45,6 +44,7 @@ import (
4544
"github.com/cortexproject/cortex/pkg/alertmanager/alertspb"
4645
"github.com/cortexproject/cortex/pkg/alertmanager/alertstore"
4746
"github.com/cortexproject/cortex/pkg/alertmanager/alertstore/bucketclient"
47+
"github.com/cortexproject/cortex/pkg/ring"
4848
"github.com/cortexproject/cortex/pkg/storage/bucket"
4949
"github.com/cortexproject/cortex/pkg/util"
5050
"github.com/cortexproject/cortex/pkg/util/test"

‎pkg/api/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/felixge/fgprof"
1313
"github.com/go-kit/log"
1414
"github.com/go-kit/log/level"
15-
"github.com/grafana/dskit/ring"
1615
"github.com/prometheus/client_golang/prometheus"
1716
"github.com/prometheus/prometheus/storage"
1817
"github.com/weaveworks/common/middleware"
@@ -31,6 +30,7 @@ import (
3130
"github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb"
3231
"github.com/cortexproject/cortex/pkg/ingester/client"
3332
"github.com/cortexproject/cortex/pkg/querier"
33+
"github.com/cortexproject/cortex/pkg/ring"
3434
"github.com/cortexproject/cortex/pkg/ruler"
3535
"github.com/cortexproject/cortex/pkg/scheduler"
3636
"github.com/cortexproject/cortex/pkg/scheduler/schedulerpb"

‎pkg/compactor/compactor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/go-kit/log/level"
1818
"github.com/grafana/dskit/backoff"
1919
"github.com/grafana/dskit/flagext"
20-
"github.com/grafana/dskit/ring"
2120
"github.com/grafana/dskit/services"
2221
"github.com/pkg/errors"
2322
"github.com/prometheus/client_golang/prometheus"
@@ -29,6 +28,7 @@ import (
2928
"github.com/thanos-io/thanos/pkg/compact/downsample"
3029
"github.com/thanos-io/thanos/pkg/objstore"
3130

31+
"github.com/cortexproject/cortex/pkg/ring"
3232
"github.com/cortexproject/cortex/pkg/storage/bucket"
3333
cortex_tsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
3434
"github.com/cortexproject/cortex/pkg/storage/tsdb/bucketindex"

‎pkg/compactor/compactor_ring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/go-kit/log/level"
99
"github.com/grafana/dskit/flagext"
1010
"github.com/grafana/dskit/kv"
11-
"github.com/grafana/dskit/ring"
1211

12+
"github.com/cortexproject/cortex/pkg/ring"
1313
util_log "github.com/cortexproject/cortex/pkg/util/log"
1414
)
1515

‎pkg/compactor/compactor_ring_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import (
55
"time"
66

77
"github.com/grafana/dskit/flagext"
8-
"github.com/grafana/dskit/ring"
98
"github.com/stretchr/testify/assert"
9+
10+
"github.com/cortexproject/cortex/pkg/ring"
1011
)
1112

1213
func TestRingConfig_DefaultConfigToLifecyclerConfig(t *testing.T) {

‎pkg/compactor/compactor_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/grafana/dskit/concurrency"
2222
"github.com/grafana/dskit/flagext"
2323
"github.com/grafana/dskit/kv/consul"
24-
"github.com/grafana/dskit/ring"
2524
"github.com/grafana/dskit/services"
2625
"github.com/oklog/ulid"
2726
"github.com/pkg/errors"
@@ -37,6 +36,7 @@ import (
3736
"github.com/thanos-io/thanos/pkg/objstore"
3837
"gopkg.in/yaml.v2"
3938

39+
"github.com/cortexproject/cortex/pkg/ring"
4040
"github.com/cortexproject/cortex/pkg/storage/bucket"
4141
cortex_tsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
4242
cortex_testutil "github.com/cortexproject/cortex/pkg/util/test"

‎pkg/cortex/cortex.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/grafana/dskit/grpcutil"
1717
"github.com/grafana/dskit/kv/memberlist"
1818
"github.com/grafana/dskit/modules"
19-
"github.com/grafana/dskit/ring"
2019
"github.com/grafana/dskit/runtimeconfig"
2120
"github.com/grafana/dskit/services"
2221
"github.com/pkg/errors"
@@ -51,6 +50,7 @@ import (
5150
"github.com/cortexproject/cortex/pkg/querier/queryrange"
5251
"github.com/cortexproject/cortex/pkg/querier/tenantfederation"
5352
querier_worker "github.com/cortexproject/cortex/pkg/querier/worker"
53+
"github.com/cortexproject/cortex/pkg/ring"
5454
"github.com/cortexproject/cortex/pkg/ruler"
5555
"github.com/cortexproject/cortex/pkg/ruler/rulestore"
5656
"github.com/cortexproject/cortex/pkg/scheduler"

‎pkg/cortex/cortex_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414

1515
"github.com/grafana/dskit/flagext"
1616
"github.com/grafana/dskit/kv"
17-
"github.com/grafana/dskit/ring"
1817
"github.com/grafana/dskit/services"
1918
"github.com/prometheus/client_golang/prometheus"
2019
"github.com/stretchr/testify/assert"
@@ -27,6 +26,7 @@ import (
2726
"github.com/cortexproject/cortex/pkg/chunk/storage"
2827
"github.com/cortexproject/cortex/pkg/frontend/v1/frontendv1pb"
2928
"github.com/cortexproject/cortex/pkg/ingester"
29+
"github.com/cortexproject/cortex/pkg/ring"
3030
"github.com/cortexproject/cortex/pkg/ruler"
3131
"github.com/cortexproject/cortex/pkg/scheduler/schedulerpb"
3232
"github.com/cortexproject/cortex/pkg/storage/bucket"

‎pkg/cortex/modules.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/grafana/dskit/kv/codec"
1313
"github.com/grafana/dskit/kv/memberlist"
1414
"github.com/grafana/dskit/modules"
15-
"github.com/grafana/dskit/ring"
1615
"github.com/grafana/dskit/runtimeconfig"
1716
"github.com/grafana/dskit/services"
1817
"github.com/opentracing-contrib/go-stdlib/nethttp"
@@ -44,6 +43,7 @@ import (
4443
"github.com/cortexproject/cortex/pkg/querier/queryrange"
4544
"github.com/cortexproject/cortex/pkg/querier/tenantfederation"
4645
querier_worker "github.com/cortexproject/cortex/pkg/querier/worker"
46+
"github.com/cortexproject/cortex/pkg/ring"
4747
"github.com/cortexproject/cortex/pkg/ruler"
4848
"github.com/cortexproject/cortex/pkg/scheduler"
4949
"github.com/cortexproject/cortex/pkg/storegateway"

‎pkg/distributor/distributor.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import (
1212
"github.com/go-kit/log"
1313
"github.com/go-kit/log/level"
1414
"github.com/grafana/dskit/limiter"
15-
"github.com/grafana/dskit/ring"
16-
ring_client "github.com/grafana/dskit/ring/client"
1715
"github.com/grafana/dskit/services"
1816
"github.com/opentracing/opentracing-go"
1917
"github.com/pkg/errors"
@@ -31,6 +29,8 @@ import (
3129
"github.com/cortexproject/cortex/pkg/cortexpb"
3230
ingester_client "github.com/cortexproject/cortex/pkg/ingester/client"
3331
"github.com/cortexproject/cortex/pkg/prom1/storage/metric"
32+
"github.com/cortexproject/cortex/pkg/ring"
33+
ring_client "github.com/cortexproject/cortex/pkg/ring/client"
3434
"github.com/cortexproject/cortex/pkg/tenant"
3535
"github.com/cortexproject/cortex/pkg/util"
3636
"github.com/cortexproject/cortex/pkg/util/extract"

‎pkg/distributor/distributor_ring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/go-kit/log/level"
99
"github.com/grafana/dskit/flagext"
1010
"github.com/grafana/dskit/kv"
11-
"github.com/grafana/dskit/ring"
1211

12+
"github.com/cortexproject/cortex/pkg/ring"
1313
util_log "github.com/cortexproject/cortex/pkg/util/log"
1414
)
1515

‎pkg/distributor/distributor_ring_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import (
55
"time"
66

77
"github.com/grafana/dskit/flagext"
8-
"github.com/grafana/dskit/ring"
98
"github.com/stretchr/testify/assert"
9+
10+
"github.com/cortexproject/cortex/pkg/ring"
1011
)
1112

1213
func TestRingConfig_DefaultConfigToLifecyclerConfig(t *testing.T) {

‎pkg/distributor/distributor_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import (
1818
"github.com/grafana/dskit/flagext"
1919
"github.com/grafana/dskit/kv"
2020
"github.com/grafana/dskit/kv/consul"
21-
"github.com/grafana/dskit/ring"
22-
ring_client "github.com/grafana/dskit/ring/client"
2321
"github.com/grafana/dskit/services"
2422
"github.com/prometheus/client_golang/prometheus"
2523
"github.com/prometheus/client_golang/prometheus/testutil"
@@ -39,6 +37,8 @@ import (
3937
"github.com/cortexproject/cortex/pkg/ingester"
4038
"github.com/cortexproject/cortex/pkg/ingester/client"
4139
"github.com/cortexproject/cortex/pkg/prom1/storage/metric"
40+
"github.com/cortexproject/cortex/pkg/ring"
41+
ring_client "github.com/cortexproject/cortex/pkg/ring/client"
4242
"github.com/cortexproject/cortex/pkg/tenant"
4343
"github.com/cortexproject/cortex/pkg/util"
4444
"github.com/cortexproject/cortex/pkg/util/chunkcompat"

‎pkg/distributor/ha_tracker_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/grafana/dskit/flagext"
1212
"github.com/grafana/dskit/kv"
1313
"github.com/grafana/dskit/kv/consul"
14-
"github.com/grafana/dskit/ring"
1514
"github.com/grafana/dskit/services"
1615
"github.com/pkg/errors"
1716
"github.com/prometheus/client_golang/prometheus"
@@ -23,6 +22,7 @@ import (
2322
"github.com/weaveworks/common/user"
2423

2524
"github.com/cortexproject/cortex/pkg/cortexpb"
25+
"github.com/cortexproject/cortex/pkg/ring"
2626
"github.com/cortexproject/cortex/pkg/util"
2727
util_log "github.com/cortexproject/cortex/pkg/util/log"
2828
"github.com/cortexproject/cortex/pkg/util/test"

‎pkg/distributor/ingester_client_pool.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import (
55
"time"
66

77
"github.com/go-kit/log"
8-
"github.com/grafana/dskit/ring"
9-
ring_client "github.com/grafana/dskit/ring/client"
108
"github.com/prometheus/client_golang/prometheus"
119
"github.com/prometheus/client_golang/prometheus/promauto"
10+
11+
"github.com/cortexproject/cortex/pkg/ring"
12+
ring_client "github.com/cortexproject/cortex/pkg/ring/client"
1213
)
1314

1415
var clients = promauto.NewGauge(prometheus.GaugeOpts{

‎pkg/distributor/query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"time"
88

99
"github.com/grafana/dskit/grpcutil"
10-
"github.com/grafana/dskit/ring"
1110
"github.com/opentracing/opentracing-go"
1211
"github.com/prometheus/common/model"
1312
"github.com/prometheus/prometheus/model/labels"
@@ -16,6 +15,7 @@ import (
1615
"github.com/cortexproject/cortex/pkg/cortexpb"
1716
ingester_client "github.com/cortexproject/cortex/pkg/ingester/client"
1817
"github.com/cortexproject/cortex/pkg/querier/stats"
18+
"github.com/cortexproject/cortex/pkg/ring"
1919
"github.com/cortexproject/cortex/pkg/tenant"
2020
"github.com/cortexproject/cortex/pkg/util"
2121
"github.com/cortexproject/cortex/pkg/util/extract"

‎pkg/ingester/flush_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010

1111
"github.com/go-kit/log"
1212
"github.com/grafana/dskit/kv"
13-
"github.com/grafana/dskit/ring"
1413
"github.com/grafana/dskit/services"
1514
"github.com/prometheus/common/model"
1615
"github.com/prometheus/prometheus/model/labels"
@@ -21,6 +20,7 @@ import (
2120
"github.com/cortexproject/cortex/pkg/chunk"
2221
"github.com/cortexproject/cortex/pkg/cortexpb"
2322
"github.com/cortexproject/cortex/pkg/ingester/client"
23+
"github.com/cortexproject/cortex/pkg/ring"
2424
"github.com/cortexproject/cortex/pkg/util"
2525
"github.com/cortexproject/cortex/pkg/util/validation"
2626
)

‎pkg/ingester/ingester.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/go-kit/log"
1414
"github.com/go-kit/log/level"
1515
"github.com/gogo/status"
16-
"github.com/grafana/dskit/ring"
1716
"github.com/grafana/dskit/services"
1817
"github.com/pkg/errors"
1918
"github.com/prometheus/client_golang/prometheus"
@@ -29,6 +28,7 @@ import (
2928
cortex_chunk "github.com/cortexproject/cortex/pkg/chunk"
3029
"github.com/cortexproject/cortex/pkg/cortexpb"
3130
"github.com/cortexproject/cortex/pkg/ingester/client"
31+
"github.com/cortexproject/cortex/pkg/ring"
3232
"github.com/cortexproject/cortex/pkg/storage/tsdb"
3333
"github.com/cortexproject/cortex/pkg/tenant"
3434
"github.com/cortexproject/cortex/pkg/util"

‎pkg/ingester/ingester_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"time"
1818

1919
"github.com/go-kit/log"
20-
"github.com/grafana/dskit/ring"
2120
"github.com/grafana/dskit/services"
2221
"github.com/prometheus/client_golang/prometheus"
2322
"github.com/prometheus/client_golang/prometheus/testutil"
@@ -33,6 +32,7 @@ import (
3332
promchunk "github.com/cortexproject/cortex/pkg/chunk/encoding"
3433
"github.com/cortexproject/cortex/pkg/cortexpb"
3534
"github.com/cortexproject/cortex/pkg/ingester/client"
35+
"github.com/cortexproject/cortex/pkg/ring"
3636
"github.com/cortexproject/cortex/pkg/util/chunkcompat"
3737
"github.com/cortexproject/cortex/pkg/util/test"
3838
"github.com/cortexproject/cortex/pkg/util/validation"

‎pkg/ingester/ingester_v2.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/go-kit/log"
1515
"github.com/go-kit/log/level"
1616
"github.com/grafana/dskit/concurrency"
17-
"github.com/grafana/dskit/ring"
1817
"github.com/grafana/dskit/services"
1918
"github.com/oklog/ulid"
2019
"github.com/pkg/errors"
@@ -36,6 +35,7 @@ import (
3635
"github.com/cortexproject/cortex/pkg/chunk/encoding"
3736
"github.com/cortexproject/cortex/pkg/cortexpb"
3837
"github.com/cortexproject/cortex/pkg/ingester/client"
38+
"github.com/cortexproject/cortex/pkg/ring"
3939
"github.com/cortexproject/cortex/pkg/storage/bucket"
4040
cortex_tsdb "github.com/cortexproject/cortex/pkg/storage/tsdb"
4141
"github.com/cortexproject/cortex/pkg/tenant"

0 commit comments

Comments
 (0)