Address review feedback

m3db · Sep 11, 2018 · 4ac6997 · 4ac6997
1 parent 139b87a
commit 4ac6997
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 0 deletions.
diff --git a/kube/bundle.yaml b/kube/bundle.yaml
diff --git a/kube/m3dbnode-configmap.yaml b/kube/m3dbnode-configmap.yaml
@@ -68,6 +68,7 @@ data:
         bootstrappers:
             - filesystem
             - commitlog
+            - peers
             - uninitialized
         fs:
             numProcessorsPerCPU: 0.125

diff --git a/src/cmd/services/m3dbnode/config/bootstrap.go b/src/cmd/services/m3dbnode/config/bootstrap.go
@@ -198,6 +198,8 @@ func ValidateBootstrappersOrder(names []string) error {
 		peers.PeersBootstrapperName: []string{
 			// Peers must always appear after filesystem
 			bfs.FileSystemBootstrapperName,
+			// Peers may appear before OR after commitlog
+			commitlog.CommitLogBootstrapperName,
 		},
 		commitlog.CommitLogBootstrapperName: []string{
 			// Commit log bootstrapper may appear after filesystem or peers

diff --git a/src/cmd/services/m3dbnode/main/main_index_test.go b/src/cmd/services/m3dbnode/main/main_index_test.go
@@ -327,6 +327,7 @@ db:
         bootstrappers:
             - filesystem
             - commitlog
+            - peers
             - uninitialized
         fs:
             numProcessorsPerCPU: 0.125

diff --git a/src/cmd/services/m3dbnode/main/main_test.go b/src/cmd/services/m3dbnode/main/main_test.go
@@ -487,6 +487,7 @@ db:
         bootstrappers:
             - filesystem
             - commitlog
+            - peers
             - uninitialized
         fs:
             numProcessorsPerCPU: 0.125

diff --git a/src/dbnode/config/m3dbnode-local-etcd.yml b/src/dbnode/config/m3dbnode-local-etcd.yml
@@ -63,6 +63,7 @@ db:
     bootstrappers:
         - filesystem
         - commitlog
+        - peers
         - uninitialized
     fs:
         numProcessorsPerCPU: 0.125

diff --git a/src/dbnode/config/m3dbnode-local.yml b/src/dbnode/config/m3dbnode-local.yml
@@ -63,6 +63,7 @@ db:
     bootstrappers:
         - filesystem
         - commitlog
+        - peers
         - uninitialized
     fs:
         numProcessorsPerCPU: 0.125

diff --git a/src/dbnode/example/m3db-node-config.yaml b/src/dbnode/example/m3db-node-config.yaml
@@ -47,6 +47,7 @@ bootstrap:
   bootstrappers:
       - filesystem
       - commitlog
+      - peers
       - uninitialized
   fs:
       numProcessorsPerCPU: 0.125

diff --git a/src/query/benchmark/benchmarker/main/m3dbnode-local-config.yaml b/src/query/benchmark/benchmarker/main/m3dbnode-local-config.yaml
@@ -50,6 +50,7 @@ bootstrap:
   bootstrappers:
       - filesystem
       - commitlog
+      - peers
       - uninitialized
   fs:
       numProcessorsPerCPU: 0.125

diff --git a/src/query/benchmark/configs/m3db_config.yaml b/src/query/benchmark/configs/m3db_config.yaml
@@ -49,6 +49,7 @@ bootstrap:
     bootstrappers:
         - filesystem
         - commitlog
+        - peers
         - uninitialized
     fs:
         numProcessorsPerCPU: 0.125

diff --git a/src/query/benchmark/configs/multi_node_setup/m3dbnode-server1-config.yaml b/src/query/benchmark/configs/multi_node_setup/m3dbnode-server1-config.yaml
@@ -48,6 +48,7 @@ bootstrap:
   bootstrappers:
       - filesystem
       - commitlog
+      - peers
       - uninitialized
   fs:
       numProcessorsPerCPU: 0.125

diff --git a/src/query/benchmark/configs/multi_node_setup/m3dbnode-server2-config.yaml b/src/query/benchmark/configs/multi_node_setup/m3dbnode-server2-config.yaml
@@ -48,6 +48,7 @@ bootstrap:
   bootstrappers:
       - filesystem
       - commitlog
+      - peers
       - uninitialized
   fs:
       numProcessorsPerCPU: 0.125

diff --git a/src/query/benchmark/configs/multi_node_setup/m3dbnode-server3-config.yaml b/src/query/benchmark/configs/multi_node_setup/m3dbnode-server3-config.yaml
@@ -48,6 +48,7 @@ bootstrap:
   bootstrappers:
       - filesystem
       - commitlog
+      - peers
       - uninitialized
   fs:
       numProcessorsPerCPU: 0.125