[Dev-infra]Fix a minor bug in dev-infra setup (#437)

Fix a minor bug on the dev-infra setup. In MongoDB, config servers are initiated with --configsvr flag. The mongo-cnf-setup container has to use this flag as well.

Author: aravandi

Makefile

@@ -50,12 +50,12 @@ define TEST_ENV
 	TEST_MONGODB_S1_PRIMARY_PORT=$(TEST_MONGODB_S1_PRIMARY_PORT) \
 	TEST_MONGODB_S1_SECONDARY1_PORT=$(TEST_MONGODB_S1_SECONDARY1_PORT) \
 	TEST_MONGODB_S1_SECONDARY2_PORT=$(TEST_MONGODB_S1_SECONDARY2_PORT) \
-	TEST_MONGODB_S1_ARTBITER_PORT=$(TEST_MONGODB_S1_ARTBITER_PORT) \
+	TEST_MONGODB_S1_ARTBITER_PORT=$(TEST_MONGODB_S1_ARBITER_PORT) \
 	TEST_MONGODB_S2_RS=$(TEST_MONGODB_S2_RS) \
 	TEST_MONGODB_S2_PRIMARY_PORT=$(TEST_MONGODB_S2_PRIMARY_PORT) \
 	TEST_MONGODB_S2_SECONDARY1_PORT=$(TEST_MONGODB_S2_SECONDARY1_PORT) \
 	TEST_MONGODB_S2_SECONDARY2_PORT=$(TEST_MONGODB_S2_SECONDARY2_PORT) \
-	TEST_MONGODB_S2_ARTBITER_PORT=$(TEST_MONGODB_S2_ARTBITER_PORT) \
+	TEST_MONGODB_S2_ARTBITER_PORT=$(TEST_MONGODB_S2_ARBITER_PORT) \
 	TEST_MONGODB_CONFIGSVR_RS=$(TEST_MONGODB_CONFIGSVR_RS) \
 	TEST_MONGODB_CONFIGSVR1_PORT=$(TEST_MONGODB_CONFIGSVR1_PORT) \
 	TEST_MONGODB_CONFIGSVR2_PORT=$(TEST_MONGODB_CONFIGSVR2_PORT) \

docker-compose.yml

@@ -151,7 +151,7 @@ services:
             - MONGO3=mongo-cnf-3
             - RS=cnf-serv
             - PORT=27017
-        entrypoint: [ "/scripts/setup.sh" ]
+        entrypoint: [ "/scripts/setup.sh","cnf_servers" ]
 
     mongos:
         container_name: "mongos"

docker/scripts/setup.sh

@@ -16,8 +16,39 @@ done
 echo "Started.."
 
 echo setup.sh time now: `date +"%T" `
-mongo --host ${mongodb1}:${port} <<EOF
-   var cfg = {
+
+
+function cnf_servers() {
+    echo "setup cnf servers"
+    mongo --host ${mongodb1}:${port} <<EOF
+    var cfg = {
+        "_id": "${RS}",
+        "protocolVersion": 1,
+        "configsvr": true,
+        "members": [
+            {
+                "_id": 0,
+                "host": "${mongodb1}:${port}"
+            },
+            {
+                "_id": 1,
+                "host": "${mongodb2}:${port}"
+            },
+            {
+                "_id": 2,
+                "host": "${mongodb3}:${port}"
+            }
+        ]
+    };
+    rs.initiate(cfg, { force: true });
+    rs.reconfig(cfg, { force: true });
+EOF
+}
+
+function general_servers() {
+    echo "setup servers"
+    mongo --host ${mongodb1}:${port} <<EOF
+    var cfg = {
         "_id": "${RS}",
         "protocolVersion": 1,
         "members": [
@@ -40,4 +71,15 @@ mongo --host ${mongodb1}:${port} <<EOF
 
     rs.addArb("${arbiter}:${port}")
 EOF
+}
 
+case $1 in
+    cnf_servers)
+        cnf_servers
+        shift
+        ;;
+    *)
+        general_servers
+        shift
+        ;;
+esac