Simplify M3DB config

kube/m3dbnode-configmap.yaml

@@ -47,21 +47,6 @@ data:
       client:
         writeConsistencyLevel: majority
         readConsistencyLevel: unstrict_majority
-        writeTimeout: 10s
-        fetchTimeout: 15s
-        connectTimeout: 20s
-        writeRetry:
-            initialBackoff: 500ms
-            backoffFactor: 3
-            maxRetries: 2
-            jitter: true
-        fetchRetry:
-            initialBackoff: 500ms
-            backoffFactor: 2
-            maxRetries: 3
-            jitter: true
-        backgroundHealthCheckFailLimit: 4
-        backgroundHealthCheckFailThrottleFactor: 0.5
 
       gcPercentage: 100
 
@@ -88,119 +73,7 @@ data:
 
       fs:
         filePathPrefix: /var/lib/m3db
-        writeBufferSize: 65536
-        dataReadBufferSize: 65536
-        infoReadBufferSize: 128
-        seekReadBufferSize: 4096
-        throughputLimitMbps: 100.0
-        throughputCheckEvery: 128
 
-      repair:
-        enabled: false
-        interval: 2h
-        offset: 30m
-        jitter: 1h
-        throttle: 2m
-        checkInterval: 1m
-
-      pooling:
-        blockAllocSize: 16
-        type: simple
-        seriesPool:
-            size: 262144
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        blockPool:
-            size: 262144
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        encoderPool:
-            size: 262144
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        closersPool:
-            size: 104857
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        contextPool:
-            size: 262144
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        segmentReaderPool:
-            size: 16384
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        iteratorPool:
-            size: 2048
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        fetchBlockMetadataResultsPool:
-            size: 65536
-            capacity: 32
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        fetchBlocksMetadataResultsPool:
-            size: 32
-            capacity: 4096
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        hostBlockMetadataSlicePool:
-            size: 131072
-            capacity: 3
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        blockMetadataPool:
-            size: 65536
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        blockMetadataSlicePool:
-            size: 65536
-            capacity: 32
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        blocksMetadataPool:
-            size: 65536
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        blocksMetadataSlicePool:
-            size: 32
-            capacity: 4096
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        identifierPool:
-            size: 262144
-            lowWatermark: 0.7
-            highWatermark: 1.0
-        bytesPool:
-            buckets:
-                - capacity: 16
-                  size: 524288
-                  lowWatermark: 0.7
-                  highWatermark: 1.0
-                - capacity: 32
-                  size: 262144
-                  lowWatermark: 0.7
-                  highWatermark: 1.0
-                - capacity: 64
-                  size: 131072
-                  lowWatermark: 0.7
-                  highWatermark: 1.0
-                - capacity: 128
-                  size: 65536
-                  lowWatermark: 0.7
-                  highWatermark: 1.0
-                - capacity: 256
-                  size: 65536
-                  lowWatermark: 0.7
-                  highWatermark: 1.0
-                - capacity: 1440
-                  size: 16384
-                  lowWatermark: 0.7
-                  highWatermark: 1.0
-                - capacity: 4096
-                  size: 8192
-                  lowWatermark: 0.7
-                  highWatermark: 1.0
       config:
         service:
             env: default_env

scripts/development/m3_stack/m3coordinator.yml

@@ -32,23 +32,6 @@ clusters:
             - zone: embedded
               endpoints:
                 - m3db_seed:2379
-      writeConsistencyLevel: majority
-      readConsistencyLevel: unstrict_majority
-      writeTimeout: 10s
-      fetchTimeout: 15s
-      connectTimeout: 20s
-      writeRetry:
-        initialBackoff: 500ms
-        backoffFactor: 3
-        maxRetries: 2
-        jitter: true
-      fetchRetry:
-        initialBackoff: 500ms
-        backoffFactor: 2
-        maxRetries: 3
-        jitter: true
-      backgroundHealthCheckFailLimit: 4
-      backgroundHealthCheckFailThrottleFactor: 0.5
 
 ingest:
   ingester:

scripts/development/m3_stack/m3dbnode.yml

@@ -22,21 +22,6 @@ db:
   client:
     writeConsistencyLevel: majority
     readConsistencyLevel: unstrict_majority
-    writeTimeout: 10s
-    fetchTimeout: 15s
-    connectTimeout: 20s
-    writeRetry:
-        initialBackoff: 500ms
-        backoffFactor: 3
-        maxRetries: 2
-        jitter: true
-    fetchRetry:
-        initialBackoff: 500ms
-        backoffFactor: 2
-        maxRetries: 3
-        jitter: true
-    backgroundHealthCheckFailLimit: 4
-    backgroundHealthCheckFailThrottleFactor: 0.5
 
   gcPercentage: 100
 
@@ -67,119 +52,6 @@ db:
 
   fs:
     filePathPrefix: /var/lib/m3db
-    writeBufferSize: 65536
-    dataReadBufferSize: 65536
-    infoReadBufferSize: 128
-    seekReadBufferSize: 4096
-    throughputLimitMbps: 100.0
-    throughputCheckEvery: 128
-
-  repair:
-    enabled: false
-    interval: 2h
-    offset: 30m
-    jitter: 1h
-    throttle: 2m
-    checkInterval: 1m
-
-  pooling:
-    blockAllocSize: 16
-    type: simple
-    seriesPool:
-        size: 262144
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    blockPool:
-        size: 262144
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    encoderPool:
-        size: 262144
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    closersPool:
-        size: 104857
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    contextPool:
-        size: 262144
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    segmentReaderPool:
-        size: 16384
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    iteratorPool:
-        size: 2048
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    fetchBlockMetadataResultsPool:
-        size: 65536
-        capacity: 32
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    fetchBlocksMetadataResultsPool:
-        size: 32
-        capacity: 4096
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    hostBlockMetadataSlicePool:
-        size: 131072
-        capacity: 3
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    blockMetadataPool:
-        size: 65536
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    blockMetadataSlicePool:
-        size: 65536
-        capacity: 32
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    blocksMetadataPool:
-        size: 65536
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    blocksMetadataSlicePool:
-        size: 32
-        capacity: 4096
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    identifierPool:
-        size: 262144
-        lowWatermark: 0.7
-        highWatermark: 1.0
-    bytesPool:
-        buckets:
-            - capacity: 16
-              size: 524288
-              lowWatermark: 0.7
-              highWatermark: 1.0
-            - capacity: 32
-              size: 262144
-              lowWatermark: 0.7
-              highWatermark: 1.0
-            - capacity: 64
-              size: 131072
-              lowWatermark: 0.7
-              highWatermark: 1.0
-            - capacity: 128
-              size: 65536
-              lowWatermark: 0.7
-              highWatermark: 1.0
-            - capacity: 256
-              size: 65536
-              lowWatermark: 0.7
-              highWatermark: 1.0
-            - capacity: 1440
-              size: 16384
-              lowWatermark: 0.7
-              highWatermark: 1.0
-            - capacity: 4096
-              size: 8192
-              lowWatermark: 0.7
-              highWatermark: 1.0
 
   config:
       service:

scripts/docker-integration-tests/carbon/m3coordinator.yml

@@ -34,21 +34,6 @@ clusters:
                 - dbnode01:2379
       writeConsistencyLevel: majority
       readConsistencyLevel: unstrict_majority
-      writeTimeout: 10s
-      fetchTimeout: 15s
-      connectTimeout: 20s
-      writeRetry:
-        initialBackoff: 500ms
-        backoffFactor: 3
-        maxRetries: 2
-        jitter: true
-      fetchRetry:
-        initialBackoff: 500ms
-        backoffFactor: 2
-        maxRetries: 3
-        jitter: true
-      backgroundHealthCheckFailLimit: 4
-      backgroundHealthCheckFailThrottleFactor: 0.5
 
 carbon:
   ingester:

scripts/docker-integration-tests/prometheus/m3coordinator.yml

@@ -34,18 +34,3 @@ clusters:
                 - dbnode01:2379
       writeConsistencyLevel: majority
       readConsistencyLevel: unstrict_majority
-      writeTimeout: 10s
-      fetchTimeout: 15s
-      connectTimeout: 20s
-      writeRetry:
-        initialBackoff: 500ms
-        backoffFactor: 3
-        maxRetries: 2
-        jitter: true
-      fetchRetry:
-        initialBackoff: 500ms
-        backoffFactor: 2
-        maxRetries: 3
-        jitter: true
-      backgroundHealthCheckFailLimit: 4
-      backgroundHealthCheckFailThrottleFactor: 0.5

src/cmd/services/m3dbnode/config/config.go

@@ -118,7 +118,7 @@ type DBConfiguration struct {
 	CommitLog CommitLogPolicy `yaml:"commitlog"`
 
 	// The repair policy for repairing in-memory data.
-	Repair RepairPolicy `yaml:"repair"`
+	Repair *RepairPolicy `yaml:"repair"`
 
 	// The pooling policy.
 	PoolingPolicy PoolingPolicy `yaml:"pooling"`
@@ -256,7 +256,7 @@ func NewEtcdEmbedConfig(cfg DBConfiguration) (*embed.Config, error) {
 
 	dir := kvCfg.RootDir
 	if dir == "" {
-		dir = path.Join(cfg.Filesystem.FilePathPrefix, defaultEtcdDirSuffix)
+		dir = path.Join(cfg.Filesystem.FilePathPrefixOrDefault(), defaultEtcdDirSuffix)
 	}
 	newKVCfg.Dir = dir