Skip to content

Commit

Permalink
Remove CacheAllMetadata caching policy (#1110)
Browse files Browse the repository at this point in the history
* Remove CacheAllMetadata caching policy
  • Loading branch information
justinjc authored Oct 22, 2018
1 parent 9a19fd7 commit 6c086cf
Show file tree
Hide file tree
Showing 64 changed files with 418 additions and 4,132 deletions.
7 changes: 0 additions & 7 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@ steps:
gopath-checkout#v1.0.1:
import: github.com/m3db/m3
<<: *common
- label: "Integration (dbnode All Metadata) %n"
parallelism: 2
command: make clean install-vendor test-ci-integration-dbnode cache_policy=all_metadata
plugins:
docker-compose#v2.5.1:
run: app
<<: *common
- name: "Integration (dbnode Recently Read) %n"
parallelism: 2
command: make clean install-vendor test-ci-integration-dbnode cache_policy=recently_read
Expand Down
20 changes: 0 additions & 20 deletions src/cmd/services/m3dbnode/config/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ type BootstrapConfiguration struct {
// Filesystem bootstrapper configuration.
Filesystem *BootstrapFilesystemConfiguration `yaml:"fs"`

// Peers bootstrapper configuration.
Peers *BootstrapPeersConfiguration `yaml:"peers"`

// Commitlog bootstrapper configuration.
Commitlog *BootstrapCommitlogConfiguration `yaml:"commitlog"`

Expand All @@ -72,28 +69,12 @@ func (bsc BootstrapConfiguration) fsNumProcessors() int {
return int(math.Ceil(float64(runtime.NumCPU()) * np))
}

// TODO: Remove once v1 endpoint no longer required.
func (bsc BootstrapConfiguration) peersFetchBlocksMetadataEndpointVersion() client.FetchBlocksMetadataEndpointVersion {
version := client.FetchBlocksMetadataEndpointDefault
if peersCfg := bsc.Peers; peersCfg != nil {
version = peersCfg.FetchBlocksMetadataEndpointVersion
}
return version
}

// BootstrapFilesystemConfiguration specifies config for the fs bootstrapper.
type BootstrapFilesystemConfiguration struct {
// NumProcessorsPerCPU is the number of processors per CPU.
NumProcessorsPerCPU float64 `yaml:"numProcessorsPerCPU" validate:"min=0.0"`
}

// BootstrapPeersConfiguration specifies config for the peers bootstrapper.
type BootstrapPeersConfiguration struct {
// FetchBlocksMetadataEndpointVersion is the endpoint to use when fetching blocks metadata.
// TODO: Remove once v1 endpoint no longer required.
FetchBlocksMetadataEndpointVersion client.FetchBlocksMetadataEndpointVersion `yaml:"fetchBlocksMetadataEndpointVersion"`
}

// BootstrapCommitlogConfiguration specifies config for the commitlog bootstrapper.
type BootstrapCommitlogConfiguration struct {
// ReturnUnfulfilledForCorruptCommitlogFiles controls whether the commitlog bootstrapper
Expand Down Expand Up @@ -171,7 +152,6 @@ func (bsc BootstrapConfiguration) New(
SetAdminClient(adminClient).
SetPersistManager(opts.PersistManager()).
SetDatabaseBlockRetrieverManager(opts.DatabaseBlockRetrieverManager()).
SetFetchBlocksMetadataEndpointVersion(bsc.peersFetchBlocksMetadataEndpointVersion()).
SetRuntimeOptionsManager(opts.RuntimeOptionsManager())
bs, err = peers.NewPeersBootstrapperProvider(pOpts, bs)
if err != nil {
Expand Down
1 change: 0 additions & 1 deletion src/cmd/services/m3dbnode/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,6 @@ db:
- noop-all
fs:
numProcessorsPerCPU: 0.125
peers: null
commitlog: null
cacheSeriesMetadata: null
blockRetrieve: null
Expand Down
48 changes: 24 additions & 24 deletions src/dbnode/client/client_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6c086cf

Please sign in to comment.