Skip to content

Remove shared_store and shared_store_key_prefix from shipper and compactor #10840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Oct 30, 2023
Merged

Remove shared_store and shared_store_key_prefix from shipper and compactor #10840

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a043c56
introduce path prefix to index period config
ashwanthgoli Oct 6, 2023
6eb0245
remove shared_store_prefix
ashwanthgoli Oct 9, 2023
450c748
remove shared store
ashwanthgoli Oct 9, 2023
b5ff6a9
add upgrade notes
ashwanthgoli Oct 10, 2023
bedaac8
Merge branch 'main' into ashwanth/remove-shared-store
ashwanthgoli Oct 10, 2023
3e01c94
fix tests and check-format
ashwanthgoli Oct 10, 2023
b64fd40
wip
ashwanthgoli Oct 11, 2023
7272225
misc corrections
ashwanthgoli Oct 11, 2023
a3d0395
add changelog
ashwanthgoli Oct 11, 2023
b8a7d59
review comments
ashwanthgoli Oct 12, 2023
7c5abbe
compactor: remove shared store
ashwanthgoli Oct 19, 2023
cd70820
Merge branch 'main' into ashwanth/remove-shared-store
ashwanthgoli Oct 19, 2023
fd8c322
fixup! Merge branch 'main' into ashwanth/remove-shared-store
ashwanthgoli Oct 19, 2023
7bfff9b
fix compactor test
ashwanthgoli Oct 19, 2023
203c422
review feedback
ashwanthgoli Oct 20, 2023
fb73c48
Merge branch 'main' into ashwanth/remove-shared-store
ashwanthgoli Oct 27, 2023
0d4416a
include the deletes in deprecation config checker
ashwanthgoli Oct 27, 2023
58f7935
update pull request template
ashwanthgoli Oct 27, 2023
6f2f476
minor corrections
ashwanthgoli Oct 30, 2023
22f8f97
Merge branch 'main' into ashwanth/remove-shared-store
ashwanthgoli Oct 30, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix compactor test
  • Loading branch information
@ashwanthgoli
ashwanthgoli committed Oct 19, 2023
commit 7bfff9b06af003e2047fec6e67d5e5accca6b77f
21 changes: 14 additions & 7 deletions pkg/compactor/compactor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var (
start = model.Now().Add(-30 * 24 * time.Hour)
)

func setupTestCompactor(t *testing.T, objectClients map[string]client.ObjectClient, periodConfigs []config.PeriodConfig, tempDir string) *Compactor {
func setupTestCompactor(t *testing.T, objectClients map[config.DayTime]client.ObjectClient, periodConfigs []config.PeriodConfig, tempDir string) *Compactor {
cfg := Config{}
flagext.DefaultValues(&cfg)
cfg.WorkingDirectory = filepath.Join(tempDir, workingDirName)
Expand All @@ -47,7 +47,7 @@ func setupTestCompactor(t *testing.T, objectClients map[string]client.ObjectClie

require.NoError(t, cfg.Validate())

c, err := NewCompactor(cfg, objectClients, config.SchemaConfig{
c, err := NewCompactor(cfg, objectClients, nil, config.SchemaConfig{
Configs: periodConfigs,
}, nil, nil)
require.NoError(t, err)
Expand All @@ -74,6 +74,7 @@ func TestCompactor_RunCompaction(t *testing.T) {
IndexType: "dummy",
ObjectType: "fs_01",
IndexTables: config.IndexPeriodicTableConfig{
PathPrefix: "index/",
PeriodicTableConfig: config.PeriodicTableConfig{
Prefix: indexTablePrefix,
Period: config.ObjectStorageIndexRequiredPeriod,
Expand All @@ -86,10 +87,10 @@ func TestCompactor_RunCompaction(t *testing.T) {
}

var (
objectClients = map[string]client.ObjectClient{}
objectClients = map[config.DayTime]client.ObjectClient{}
err error
)
objectClients["fs_01"], err = local.NewFSObjectClient(local.FSConfig{Directory: tempDir})
objectClients[periodConfigs[0].From], err = local.NewFSObjectClient(local.FSConfig{Directory: tempDir})
require.NoError(t, err)

compactor := setupTestCompactor(t, objectClients, periodConfigs, tempDir)
Expand Down Expand Up @@ -125,6 +126,7 @@ func TestCompactor_RunCompactionMultipleStores(t *testing.T) {
IndexType: "dummy",
ObjectType: "fs_01",
IndexTables: config.IndexPeriodicTableConfig{
PathPrefix: "index/",
PeriodicTableConfig: config.PeriodicTableConfig{
Prefix: indexTablePrefix,
Period: config.ObjectStorageIndexRequiredPeriod,
Expand All @@ -135,6 +137,7 @@ func TestCompactor_RunCompactionMultipleStores(t *testing.T) {
IndexType: "dummy",
ObjectType: "fs_02",
IndexTables: config.IndexPeriodicTableConfig{
PathPrefix: "index/",
PeriodicTableConfig: config.PeriodicTableConfig{
Prefix: indexTablePrefix,
Period: config.ObjectStorageIndexRequiredPeriod,
Expand All @@ -156,13 +159,13 @@ func TestCompactor_RunCompactionMultipleStores(t *testing.T) {
}

var (
objectClients = map[string]client.ObjectClient{}
objectClients = map[config.DayTime]client.ObjectClient{}
err error
)
objectClients["fs_01"], err = local.NewFSObjectClient(local.FSConfig{Directory: periodOnePath})
objectClients[periodConfigs[0].From], err = local.NewFSObjectClient(local.FSConfig{Directory: periodOnePath})
require.NoError(t, err)

objectClients["fs_02"], err = local.NewFSObjectClient(local.FSConfig{Directory: periodTwoPath})
objectClients[periodConfigs[1].From], err = local.NewFSObjectClient(local.FSConfig{Directory: periodTwoPath})
require.NoError(t, err)

compactor := setupTestCompactor(t, objectClients, periodConfigs, tempDir)
Expand Down Expand Up @@ -204,6 +207,7 @@ func Test_schemaPeriodForTable(t *testing.T) {
ObjectType: "filesystem",
Schema: "v9",
IndexTables: config.IndexPeriodicTableConfig{
PathPrefix: "index/",
PeriodicTableConfig: config.PeriodicTableConfig{
Prefix: indexTablePrefix,
Period: time.Hour * 24,
Expand All @@ -216,6 +220,7 @@ func Test_schemaPeriodForTable(t *testing.T) {
ObjectType: "filesystem",
Schema: "v12",
IndexTables: config.IndexPeriodicTableConfig{
PathPrefix: "index/",
PeriodicTableConfig: config.PeriodicTableConfig{
Prefix: indexTablePrefix,
Period: time.Hour * 24,
Expand All @@ -228,6 +233,7 @@ func Test_schemaPeriodForTable(t *testing.T) {
ObjectType: "filesystem",
Schema: "v12",
IndexTables: config.IndexPeriodicTableConfig{
PathPrefix: "index/",
PeriodicTableConfig: config.PeriodicTableConfig{
Prefix: tsdbIndexTablePrefix,
Period: time.Hour * 24,
Expand All @@ -240,6 +246,7 @@ func Test_schemaPeriodForTable(t *testing.T) {
ObjectType: "filesystem",
Schema: "v12",
IndexTables: config.IndexPeriodicTableConfig{
PathPrefix: "index/",
PeriodicTableConfig: config.PeriodicTableConfig{
Prefix: indexTablePrefix,
Period: time.Hour * 24,
Expand Down
2 changes: 1 addition & 1 deletion pkg/loki/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ func (t *Loki) initCompactor() (services.Service, error) {
return nil, fmt.Errorf("failed to create delete request store object client: %w", err)
}
} else {
return nil, fmt.Errorf("compactor.delete-request-store should be configured when retention is enabled.")
return nil, fmt.Errorf("compactor.delete-request-store should be configured when retention is enabled")
}
}

Expand Down