From 4ac6997bde79343a8b94f2d7c83d9c8bf842a7d4 Mon Sep 17 00:00:00 2001 From: Richard Artoul Date: Tue, 11 Sep 2018 14:16:00 -0400 Subject: [PATCH] Address review feedback --- kube/bundle.yaml | 1 + kube/m3dbnode-configmap.yaml | 1 + src/cmd/services/m3dbnode/config/bootstrap.go | 2 ++ src/cmd/services/m3dbnode/main/main_index_test.go | 1 + src/cmd/services/m3dbnode/main/main_test.go | 1 + src/dbnode/config/m3dbnode-local-etcd.yml | 1 + src/dbnode/config/m3dbnode-local.yml | 1 + src/dbnode/example/m3db-node-config.yaml | 1 + src/query/benchmark/benchmarker/main/m3dbnode-local-config.yaml | 1 + src/query/benchmark/configs/m3db_config.yaml | 1 + .../configs/multi_node_setup/m3dbnode-server1-config.yaml | 1 + .../configs/multi_node_setup/m3dbnode-server2-config.yaml | 1 + .../configs/multi_node_setup/m3dbnode-server3-config.yaml | 1 + 13 files changed, 14 insertions(+) diff --git a/kube/bundle.yaml b/kube/bundle.yaml index 8363aad91f..5b9803cc60 100644 --- a/kube/bundle.yaml +++ b/kube/bundle.yaml @@ -176,6 +176,7 @@ data: bootstrappers: - filesystem - commitlog + - peers - uninitialized fs: numProcessorsPerCPU: 0.125 diff --git a/kube/m3dbnode-configmap.yaml b/kube/m3dbnode-configmap.yaml index 94ea47aed1..37d1fc1312 100644 --- 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 index 6a31a85299..e1cbfa42d1 100644 --- 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 index f683374e62..2a8855866d 100644 --- 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 index 2896d91c0a..ff8a57bdd9 100644 --- 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 index 7c202aa98b..5a57b11c3c 100644 --- 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 index 939d7a7929..ce10d238a3 100644 --- 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 index 1748d51129..6c5304f132 100644 --- 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 index 746ee5abeb..7fe475fa37 100644 --- 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 index 852c345d31..50fc1eadc8 100644 --- 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 index 1c24a454d5..d63b571944 100644 --- 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 index 6e246e52f0..b1e8b37c29 100644 --- 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 index 750bd4e9ff..e35c81e87d 100644 --- 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