diff --git a/Makefile b/Makefile index e9dd770915..6265beffa7 100644 --- a/Makefile +++ b/Makefile @@ -216,7 +216,7 @@ test-ci-big-unit: test-big-base .PHONY: test-ci-integration test-ci-integration: - INTEGRATION_TIMEOUT=4m TEST_NATIVE_POOLING=false TEST_SERIES_CACHE_POLICY=$(cache_policy) make test-base-ci-integration + INTEGRATION_TIMEOUT=4m TEST_SERIES_CACHE_POLICY=$(cache_policy) make test-base-ci-integration $(process_coverfile) $(coverfile) define SUBDIR_RULES @@ -278,16 +278,15 @@ test-html-$(SUBDIR): @echo test-html $(SUBDIR) SRC_ROOT=./src/$(SUBDIR) make test-base-html -# Note: do not test native pooling since it's experimental/deprecated .PHONY: test-integration-$(SUBDIR) test-integration-$(SUBDIR): @echo test-integration $(SUBDIR) - SRC_ROOT=./src/$(SUBDIR) TEST_NATIVE_POOLING=false make test-base-integration + SRC_ROOT=./src/$(SUBDIR) make test-base-integration # Usage: make test-single-integration name= .PHONY: test-single-integration-$(SUBDIR) test-single-integration-$(SUBDIR): - SRC_ROOT=./src/$(SUBDIR) TEST_NATIVE_POOLING=false make test-base-single-integration name=$(name) + SRC_ROOT=./src/$(SUBDIR) make test-base-single-integration name=$(name) .PHONY: test-ci-unit-$(SUBDIR) test-ci-unit-$(SUBDIR): @@ -304,7 +303,7 @@ test-ci-big-unit-$(SUBDIR): .PHONY: test-ci-integration-$(SUBDIR) test-ci-integration-$(SUBDIR): @echo test-ci-integration $(SUBDIR) - SRC_ROOT=./src/$(SUBDIR) INTEGRATION_TIMEOUT=4m TEST_NATIVE_POOLING=false TEST_SERIES_CACHE_POLICY=$(cache_policy) make test-base-ci-integration + SRC_ROOT=./src/$(SUBDIR) INTEGRATION_TIMEOUT=4m TEST_SERIES_CACHE_POLICY=$(cache_policy) make test-base-ci-integration $(codecov_push) -f $(coverfile) -F $(SUBDIR) endef diff --git a/glide.lock b/glide.lock index 8f20c83012..6e25ecef1c 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: fca92c30a75f7f05a3f5427da46a14ea745d202adbbd790beeb7156ba8ec056d -updated: 2018-08-20T16:30:58.894229099-04:00 +hash: bc8c8f7d91429a979e2745c8507dad93a217e06525e7c0baac753dd8a8477d2e +updated: 2018-08-30T10:47:26.772333-04:00 imports: - name: github.com/apache/thrift version: c2fb1c4e8c931d22617bebb0bf388cb4d5e6fcff @@ -306,7 +306,7 @@ imports: - protocol/proto - topic - name: github.com/m3db/m3x - version: 31a628e11c478af132b6eab71506fb93c7f9ca39 + version: 0d74829a38311339911aeb8ff22c84c710832ab7 vcs: git subpackages: - checked diff --git a/glide.yaml b/glide.yaml index 8c860ccc35..88cae9feed 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,7 +1,7 @@ package: github.com/m3db/m3 import: - package: github.com/m3db/m3x - version: 31a628e11c478af132b6eab71506fb93c7f9ca39 + version: 0d74829a38311339911aeb8ff22c84c710832ab7 vcs: git subpackages: - checked diff --git a/src/cmd/services/m3dbnode/config/pooling.go b/src/cmd/services/m3dbnode/config/pooling.go index fb9351d978..45508e8c3d 100644 --- a/src/cmd/services/m3dbnode/config/pooling.go +++ b/src/cmd/services/m3dbnode/config/pooling.go @@ -26,11 +26,6 @@ type PoolingType string const ( // SimplePooling uses the basic Go runtime to allocate bytes for bytes pools. SimplePooling PoolingType = "simple" - // NativePooling uses a mmap syscall to allocate bytes for bytes pools, take - // great care when experimenting with this. There's not enough protection - // even with ref counting that M3DB performs to use this safely in - // production. Here be dragons and so forth. - NativePooling PoolingType = "native" ) const ( @@ -42,7 +37,7 @@ type PoolingPolicy struct { // The initial alloc size for a block BlockAllocSize int `yaml:"blockAllocSize"` - // The general pool type: simple or native. + // The general pool type (currently only supported: simple). Type PoolingType `yaml:"type"` // The Bytes pool buckets to use diff --git a/src/dbnode/integration/setup.go b/src/dbnode/integration/setup.go index 67ff39f038..e2ff15ddcd 100644 --- a/src/dbnode/integration/setup.go +++ b/src/dbnode/integration/setup.go @@ -52,7 +52,6 @@ import ( "github.com/m3db/m3cluster/shard" "github.com/m3db/m3x/ident" xlog "github.com/m3db/m3x/log" - "github.com/m3db/m3x/pool" xsync "github.com/m3db/m3x/sync" "github.com/stretchr/testify/require" @@ -67,10 +66,9 @@ var ( tchannelNodeAddr = flag.String("nodetchanneladdr", "127.0.0.1:9003", "Node TChannel server address") httpDebugAddr = flag.String("debughttpaddr", "127.0.0.1:9004", "HTTP debug server address") - errServerStartTimedOut = errors.New("server took too long to start") - errServerStopTimedOut = errors.New("server took too long to stop") - testNamespaces = []ident.ID{ident.StringID("testNs1"), ident.StringID("testNs2")} - testNativePoolingBuckets = []pool.Bucket{{Capacity: 4096, Count: 256}} + errServerStartTimedOut = errors.New("server took too long to start") + errServerStopTimedOut = errors.New("server took too long to stop") + testNamespaces = []ident.ID{ident.StringID("testNs1"), ident.StringID("testNs2")} created = uint64(0) ) @@ -87,7 +85,6 @@ type testSetup struct { db cluster.Database storageOpts storage.Options fsOpts fs.Options - nativePooling bool hostID string topoInit topology.Initializer shardSet sharding.ShardSet @@ -142,21 +139,6 @@ func newTestSetup(t *testing.T, opts testOptions, fsOpts fs.Options) (*testSetup return nil, err } - nativePooling := strings.ToLower(os.Getenv("TEST_NATIVE_POOLING")) == "true" - if nativePooling { - buckets := testNativePoolingBuckets - bytesPool := pool.NewCheckedBytesPool(buckets, nil, func(s []pool.Bucket) pool.BytesPool { - return pool.NewNativeHeap(s, nil) - }) - bytesPool.Init() - - storageOpts = storageOpts.SetBytesPool(bytesPool) - - idPool := ident.NewNativePool(bytesPool, ident.PoolOptions{}) - - storageOpts = storageOpts.SetIdentifierPool(idPool) - } - // Set up shard set shardSet, err := newTestShardSet(opts.NumShards()) if err != nil { @@ -327,7 +309,6 @@ func newTestSetup(t *testing.T, opts testOptions, fsOpts fs.Options) (*testSetup logger: logger, storageOpts: storageOpts, fsOpts: fsOpts, - nativePooling: nativePooling, hostID: id, topoInit: topoInit, shardSet: shardSet, diff --git a/src/dbnode/server/server.go b/src/dbnode/server/server.go index 7d6415c552..0cafcc3b81 100644 --- a/src/dbnode/server/server.go +++ b/src/dbnode/server/server.go @@ -918,13 +918,6 @@ func withEncodingAndPoolingOptions( func(s []pool.Bucket) pool.BytesPool { return pool.NewBytesPool(s, bytesPoolOpts) }) - case config.NativePooling: - bytesPool = pool.NewCheckedBytesPool( - buckets, - checkedBytesPoolOpts, - func(s []pool.Bucket) pool.BytesPool { - return pool.NewNativeHeap(s, bytesPoolOpts) - }) default: logger.Fatalf("unrecognized pooling type: %s", policy.Type) } diff --git a/src/dbnode/storage/bootstrap/bootstrapper/commitlog/source.go b/src/dbnode/storage/bootstrap/bootstrapper/commitlog/source.go index 42000531f7..f2f0a6f64e 100644 --- a/src/dbnode/storage/bootstrap/bootstrapper/commitlog/source.go +++ b/src/dbnode/storage/bootstrap/bootstrapper/commitlog/source.go @@ -708,7 +708,7 @@ func (s *commitLogSource) newReadCommitLogPredBasedOnAvailableSnapshotFiles( instrument.InvariantViolatedMetricName, shard, block.ToTime().String()) } - s.log.Infof( + s.log.Debugf( "most recent snapshot for block: %s and shard: %d is %s", block.ToTime().String(), shard, mostRecent.CachedSnapshotTime.String()) } @@ -723,7 +723,7 @@ func (s *commitLogSource) newReadCommitLogPredBasedOnAvailableSnapshotFiles( minimumMostRecentSnapshotTimeByBlock := s.minimumMostRecentSnapshotTimeByBlock( shardsTimeRanges, blockSize, mostRecentCompleteSnapshotByBlockShard) for block, minSnapshotTime := range minimumMostRecentSnapshotTimeByBlock { - s.log.Infof( + s.log.Debugf( "min snapshot time for block: %s is: %s", block.ToTime().String(), minSnapshotTime.String()) }