From 7b64abbb53d109df1ea93259811d1799fe522eed Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Tue, 6 Oct 2020 09:34:17 -0600 Subject: [PATCH] Reduce default RBF DB size to 4GB; remove race skips --- fragment_internal_test.go | 5 ----- rbf/os.go | 2 +- server/cluster_test.go | 5 ----- server/server_test.go | 11 ----------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/fragment_internal_test.go b/fragment_internal_test.go index a47f9fa4b..8514f7284 100644 --- a/fragment_internal_test.go +++ b/fragment_internal_test.go @@ -35,7 +35,6 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/pilosa/pilosa/v2/pql" - "github.com/pilosa/pilosa/v2/race" "github.com/pilosa/pilosa/v2/roaring" "github.com/pilosa/pilosa/v2/testhook" "github.com/pkg/errors" @@ -450,10 +449,6 @@ func TestFragment_SetValue(t *testing.T) { }) t.Run("QuickCheck", func(t *testing.T) { - if os.Getenv("PILOSA_TXSRC") == "rbf" && race.Enabled { - t.Skip("race detection enabled, skipping for rbf") - } - if err := quick.Check(func(bitDepth uint, bitN uint64, values []uint64) bool { // Limit bit depth & maximum values. bitDepth = (bitDepth % 62) + 1 diff --git a/rbf/os.go b/rbf/os.go index 7b2627f11..a76a550ef 100644 --- a/rbf/os.go +++ b/rbf/os.go @@ -19,4 +19,4 @@ package rbf // DefaultMaxSize is the default mmap size and therefore the maximum allowed // size of the database. The size can be increased by updating the DB.MaxSize // and reopening the database. This setting mainly affects virtual space usage. -const DefaultMaxSize = 100 * (1 << 30) // 100GB +const DefaultMaxSize = 4 * (1 << 30) diff --git a/server/cluster_test.go b/server/cluster_test.go index 7b17a253d..1cbda5ffc 100644 --- a/server/cluster_test.go +++ b/server/cluster_test.go @@ -26,7 +26,6 @@ import ( "time" "github.com/pilosa/pilosa/v2" - "github.com/pilosa/pilosa/v2/race" "github.com/pilosa/pilosa/v2/server" "github.com/pilosa/pilosa/v2/test" "golang.org/x/sync/errgroup" @@ -634,10 +633,6 @@ func TestCluster_GossipMembership(t *testing.T) { } func TestClusterResize_RemoveNode(t *testing.T) { - if os.Getenv("PILOSA_TXSRC") == "rbf" && race.Enabled { - t.Skip("race detection enabled, skipping for rbf") - } - cluster := test.MustRunCluster(t, 3) defer cluster.Close() m0 := cluster.GetNode(0) diff --git a/server/server_test.go b/server/server_test.go index 02af30e59..270fdcaf5 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -34,7 +34,6 @@ import ( "github.com/pilosa/pilosa/v2" "github.com/pilosa/pilosa/v2/http" "github.com/pilosa/pilosa/v2/pql" - "github.com/pilosa/pilosa/v2/race" "github.com/pilosa/pilosa/v2/roaring" "github.com/pilosa/pilosa/v2/server" "github.com/pilosa/pilosa/v2/test" @@ -52,8 +51,6 @@ func init() { // nolint: gochecknoinits func TestMain_Set_Quick(t *testing.T) { if testing.Short() { t.Skip("short") - } else if os.Getenv("PILOSA_TXSRC") == "rbf" && race.Enabled { - t.Skip("race detection enabled, skipping for rbf") } for i := 0; i < 100; i++ { @@ -950,10 +947,6 @@ func TestMain_ImportTimestampNoStandardView(t *testing.T) { } func TestClusterQueriesAfterRestart(t *testing.T) { - if os.Getenv("PILOSA_TXSRC") == "rbf" && race.Enabled { - t.Skip("race detection enabled, skipping for rbf") - } - cluster := test.MustRunCluster(t, 3) defer cluster.Close() cmd1 := cluster.GetNode(1) @@ -1178,10 +1171,6 @@ func TestClusterExhaustingConnectionsImport(t *testing.T) { } func TestClusterMinMaxSumDecimal(t *testing.T) { - if os.Getenv("PILOSA_TXSRC") == "rbf" && race.Enabled { - t.Skip("race detection enabled, skipping for rbf") - } - cluster := test.MustRunCluster(t, 3) defer cluster.Close() cmd := cluster.GetNode(0)