From 0caf04603adc05f7f8bff6d89f613638b745a67e Mon Sep 17 00:00:00 2001 From: Rohith BCS Date: Mon, 30 Oct 2023 15:50:26 +0530 Subject: [PATCH] chore: increase archiver postgres shm size --- archiver/archiver_isolation_test.go | 7 +++++-- archiver/archiver_test.go | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/archiver/archiver_isolation_test.go b/archiver/archiver_isolation_test.go index 782f3db828..733ff2e019 100644 --- a/archiver/archiver_isolation_test.go +++ b/archiver/archiver_isolation_test.go @@ -14,13 +14,16 @@ import ( "testing" "time" + "github.com/rudderlabs/rudder-go-kit/bytesize" + "github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource/postgres" "github.com/rudderlabs/rudder-server/testhelper/destination" + "golang.org/x/sync/errgroup" + "github.com/google/uuid" "github.com/ory/dockertest/v3" "github.com/stretchr/testify/require" "github.com/tidwall/gjson" - "golang.org/x/sync/errgroup" "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/filemanager" @@ -127,7 +130,7 @@ func ArchivalScenario( cleanup := &testhelper.Cleanup{} defer cleanup.Run() - postgresContainer, err := resource.SetupPostgres(pool, cleanup) + postgresContainer, err := resource.SetupPostgres(pool, cleanup, postgres.WithShmSize(256*bytesize.MB)) require.NoError(t, err, "failed to setup postgres container") minioResource, err := resource.SetupMinio(pool, cleanup) diff --git a/archiver/archiver_test.go b/archiver/archiver_test.go index b85bacf671..aa0d59de45 100644 --- a/archiver/archiver_test.go +++ b/archiver/archiver_test.go @@ -17,12 +17,12 @@ import ( "github.com/stretchr/testify/require" "github.com/tidwall/gjson" - "github.com/rudderlabs/rudder-go-kit/config" - "github.com/rudderlabs/rudder-go-kit/stats" - "github.com/rudderlabs/rudder-go-kit/bytesize" + "github.com/rudderlabs/rudder-go-kit/config" "github.com/rudderlabs/rudder-go-kit/filemanager" + "github.com/rudderlabs/rudder-go-kit/stats" "github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource" + "github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource/postgres" trand "github.com/rudderlabs/rudder-go-kit/testhelper/rand" backendconfig "github.com/rudderlabs/rudder-server/backend-config" "github.com/rudderlabs/rudder-server/jobsdb" @@ -47,7 +47,7 @@ func TestJobsArchival(t *testing.T) { pool, err := dockertest.NewPool("") require.NoError(t, err, "Failed to create docker pool") - postgresResource, err := resource.SetupPostgres(pool, t) + postgresResource, err := resource.SetupPostgres(pool, t, postgres.WithShmSize(256*bytesize.MB)) require.NoError(t, err, "failed to setup postgres resource") c := config.New() c.Set("DB.name", postgresResource.Database) @@ -205,7 +205,7 @@ func readGzipJobFile(filename string) ([]*jobsdb.JobT, error) { if err != nil { return []*jobsdb.JobT{}, err } - defer gz.Close() + defer func() { _ = gz.Close() }() sc := bufio.NewScanner(gz) // default scanner buffer maxCapacity is 64K @@ -255,24 +255,24 @@ type jdWrapper struct { queries *int32 } -func (jd jdWrapper) GetDistinctParameterValues(ctx context.Context, parameterName string) ([]string, error) { +func (jd jdWrapper) GetDistinctParameterValues(_ context.Context, _ string) ([]string, error) { atomic.AddInt32(jd.queries, 1) return []string{}, nil } func (jd jdWrapper) GetUnprocessed( - ctx context.Context, - params jobsdb.GetQueryParams, + _ context.Context, + _ jobsdb.GetQueryParams, ) (jobsdb.JobsResult, error) { atomic.AddInt32(jd.queries, 1) return jobsdb.JobsResult{}, nil } func (jd jdWrapper) UpdateJobStatus( - ctx context.Context, - statusList []*jobsdb.JobStatusT, - customValFilters []string, - parameterFilters []jobsdb.ParameterFilterT, + _ context.Context, + _ []*jobsdb.JobStatusT, + _ []string, + _ []jobsdb.ParameterFilterT, ) error { atomic.AddInt32(jd.queries, 1) return nil