Skip to content
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

Jump to bottom

release-20.1: server: Resolve default engine type in testserver #49377

Merged
merged 1 commit into from May 21, 2020
Merged

release-20.1: server: Resolve default engine type in testserver #49377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/server/testserver.go
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/sqlbase"
"github.com/cockroachdb/cockroach/pkg/sqlmigrations"
"github.com/cockroachdb/cockroach/pkg/storage"
"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
"github.com/cockroachdb/cockroach/pkg/ts"
"github.com/cockroachdb/cockroach/pkg/util"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
Expand All @@ -68,6 +69,10 @@ func makeTestConfig(st *cluster.Settings) Config {

// Configure test storage engine.
cfg.StorageEngine = storage.DefaultStorageEngine
// Resolve the storage engine to a specific type if it's the default value.
if cfg.StorageEngine == enginepb.EngineTypeDefault {
cfg.StorageEngine = enginepb.EngineTypeRocksDB
}

// Configure the default in-memory temp storage for all tests unless
// otherwise configured.
Expand Down