Merge branch 'feature/6' into develop

Author: senssei

docker-compose.1.yml

@@ -5,32 +5,35 @@ services:
         image: mongo
         ports:
             - "30012:27017"
-        command: mongod --replSet rs1 --shardsvr --port 27017
+        command: mongod --replSet rs1 --shardsvr --port 27017 --nojournal --oplogSize 16 --noprealloc --smallfiles
         restart: always
 
     mongo-1-3:
         container_name: "mongo-1-3"
         image: mongo
         ports:
             - "30013:27017"
-        command: mongod --replSet rs1 --shardsvr --port 27017
+        command: mongod --replSet rs1 --shardsvr --port 27017 --nojournal --oplogSize 16 --noprealloc --smallfiles
         restart: always 
 
     mongo-1-1:
         container_name: "mongo-1-1"
         image: mongo
         ports:
             - "30011:27017"
-        command: mongod --replSet rs1 --shardsvr --port 27017
+        command: mongod --replSet rs1 --shardsvr --port 27017 --nojournal --oplogSize 16 --noprealloc --smallfiles
         links:
             - mongo-1-2:mongo-1-2
             - mongo-1-3:mongo-1-3
         restart: always
 
     mongo-rs1-setup:
+        container_name: "mongo-rs1-setup"
         image: mongo
         depends_on:
             - "mongo-1-1"
+            - "mongo-1-2"
+            - "mongo-1-3"
         links:
             - mongo-1-1:mongo-1-1
             - mongo-1-2:mongo-1-2

docker-compose.2.yml

@@ -5,32 +5,35 @@ services:
         image: mongo
         ports:
             - "30042:27017"
-        command: mongod --replSet rs2 --shardsvr --port 27017
+        command: mongod --replSet rs2 --shardsvr --port 27017 --nojournal --oplogSize 16 --noprealloc --smallfiles
         restart: always
 
     mongo-2-3:
         container_name: "mongo-2-3"
         image: mongo
         ports:
             - "30043:27017"
-        command: mongod --replSet rs2 --shardsvr --port 27017
+        command: mongod --replSet rs2 --shardsvr --port 27017 --nojournal --oplogSize 16 --noprealloc --smallfiles
         restart: always 
 
     mongo-2-1:
         container_name: "mongo-2-1"
         image: mongo
         ports:
             - "30041:27017"
-        command: mongod --replSet rs2 --shardsvr --port 27017
+        command: mongod --replSet rs2 --shardsvr --port 27017 --nojournal --oplogSize 16 --noprealloc --smallfiles
         links:
             - mongo-2-2:mongo-2-2
             - mongo-2-3:mongo-2-3
         restart: always
 
     mongo-rs2-setup:
+        container_name: "mongo-rs2-setup"
         image: mongo
         depends_on:
             - "mongo-2-1"
+            - "mongo-2-2"
+            - "mongo-2-3"
         links:
             - mongo-2-1:mongo-2-1
             - mongo-2-2:mongo-2-2

docker-compose.cnf.yml

@@ -5,32 +5,35 @@ services:
         image: mongo
         ports:
             - "30002:27017"
-        command: mongod --replSet cnf-serv --rest --configsvr --port 27017
+        command: mongod --replSet cnf-serv --rest --configsvr --port 27017 --oplogSize 16 --noprealloc --smallfiles
         restart: always
 
     mongo-cnf-3:
         container_name: "mongo-cnf-3"
         image: mongo
         ports:
             - "30003:27017"
-        command: mongod --replSet cnf-serv --rest --configsvr --port 27017
+        command: mongod --replSet cnf-serv --rest --configsvr --port 27017 --oplogSize 16 --noprealloc --smallfiles
         restart: always 
 
     mongo-cnf-1:
         container_name: "mongo-cnf-1"
         image: mongo
         ports:
             - "30001:27017"
-        command: mongod --replSet cnf-serv --rest --configsvr --port 27017
+        command: mongod --replSet cnf-serv --rest --configsvr --port 27017 --oplogSize 16 --noprealloc --smallfiles
         links:
             - mongo-cnf-2:mongo-cnf-2
             - mongo-cnf-3:mongo-cnf-3
         restart: always
 
     mongo-cnf-setup:
+        container_name: "mongo-cnf-setup"
         image: mongo
         depends_on:
             - "mongo-cnf-1"
+            - "mongo-cnf-2"
+            - "mongo-cnf-3"
         links:
             - mongo-cnf-1:mongo-cnf-1
             - mongo-cnf-2:mongo-cnf-2
@@ -43,4 +46,4 @@ services:
             - MONGO3=mongo-cnf-3
             - RS=cnf-serv
             - PORT=27017
-        entrypoint: [ "/scripts/setup_cnf.sh" ]
+        entrypoint: [ "/scripts/setup-cnf.sh" ]

docker-compose.shard.yml

@@ -6,9 +6,9 @@ services:
         ports:
             - "30031:27017"
         depends_on:
-            - "mongo-cnf-1"
-            - "mongo-1-1"
-            - "mongo-2-1"
+            - "mongo-rs1-setup"
+            - "mongo-rs2-setup"
+            - "mongo-cnf-setup"
         links:
             - mongo-cnf-1:mongo-cnf-1
             - mongo-cnf-2:mongo-cnf-2
@@ -23,6 +23,7 @@ services:
         restart: always
 
     mongo-shard-setup:
+        container_name: "mongo-shard-setup"
         image: mongo
         depends_on:
             - "mongo-router"
@@ -44,5 +45,5 @@ services:
             - PORT1=27017
             - PORT2=27017
             - PORT3=27017
-        entrypoint: [ "/scripts/init_shard.sh" ]
+        entrypoint: [ "/scripts/init-shard.sh" ]
         restart: on-failure:20

scripts/init_shard.sh renamed to scripts/init-shard.sh

@@ -10,19 +10,17 @@ mongodb21=`ping -c 1 ${MONGO21} | head -1  | cut -d "(" -f 2 | cut -d ")" -f 1`
 mongodb22=`ping -c 1 ${MONGO22} | head -1  | cut -d "(" -f 2 | cut -d ")" -f 1`
 mongodb23=`ping -c 1 ${MONGO23} | head -1  | cut -d "(" -f 2 | cut -d ")" -f 1`
 
-
 port=${PORT:-27017}
 
 echo "Waiting for startup.."
-until curl http://${mongodb1}:${port}/serverStatus\?text\=1 2>&1 | grep uptime | head -1; do
+until mongo --host ${mongodb1}:${port} --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 2)' &>/dev/null; do
   printf '.'
   sleep 1
 done
 
-echo curl http://${mongodb1}:${port}/serverStatus\?text\=1 2>&1 | grep uptime | head -1
 echo "Started.."
 
-echo setup.sh time now: `date +"%T" `
+echo init-shard.sh time now: `date +"%T" `
 mongo --host ${mongodb1}:${port} <<EOF
    sh.addShard( "${RS1}/${mongodb11}:${PORT1},${mongodb12}:${PORT2},${mongodb13}:${PORT3}" );
    sh.addShard( "${RS2}/${mongodb21}:${PORT1},${mongodb22}:${PORT2},${mongodb23}:${PORT3}" );

scripts/setup_cnf.sh renamed to scripts/setup-cnf.sh

@@ -7,15 +7,14 @@ mongodb3=`ping -c 1 ${MONGO3} | head -1  | cut -d "(" -f 2 | cut -d ")" -f 1`
 port=${PORT:-27017}
 
 echo "Waiting for startup.."
-until curl http://${mongodb1}:${port}/serverStatus\?text\=1 2>&1 | grep uptime | head -1; do
+until mongo --host ${mongodb1}:${port} --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 2)' &>/dev/null; do
   printf '.'
   sleep 1
 done
 
-echo curl http://${mongodb1}:${port}/serverStatus\?text\=1 2>&1 | grep uptime | head -1
 echo "Started.."
 
-echo setup.sh time now: `date +"%T" `
+echo setup-cnf.sh time now: `date +"%T" `
 mongo --host ${mongodb1}:${port} <<EOF
    var cfg = {
         "_id": "${RS}",

scripts/setup.sh

@@ -7,12 +7,11 @@ mongodb3=`ping -c 1 ${MONGO3} | head -1  | cut -d "(" -f 2 | cut -d ")" -f 1`
 port=${PORT:-27017}
 
 echo "Waiting for startup.."
-until curl http://${mongodb1}:${port}/serverStatus\?text\=1 2>&1 | grep uptime | head -1; do
+until mongo --host ${mongodb1}:${port} --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 2)' &>/dev/null; do
   printf '.'
   sleep 1
 done
 
-echo curl http://${mongodb1}:${port}/serverStatus\?text\=1 2>&1 | grep uptime | head -1
 echo "Started.."
 
 echo setup.sh time now: `date +"%T" `