Use 3 x nodes per set, pass --shardsvr as a variable so we can share the mongo-rs0-# services with cluster and replset

Author: timvaillancourt

scripts/travis-ci/docker-compose.yml

@@ -2,43 +2,43 @@ version: '2'
 services:
   mongo-rs0-1:
     image: "percona/percona-server-mongodb:${MONGO_VERSION}"
-    command: mongod --port 27017 --replSet=rs0 --dbpath /data/db
+    command: mongod --port=27017 --replSet=rs0 --dbpath=/data/db ${DATA_MONGOD_FLAGS}
   mongo-rs0-2:
     image: "percona/percona-server-mongodb:${MONGO_VERSION}"
-    command: mongod --port 27017 --replSet=rs0 --dbpath /data/db
+    command: mongod --port=27017 --replSet=rs0 --dbpath=/data/db ${DATA_MONGOD_FLAGS}
   mongo-rs0-3:
     image: "percona/percona-server-mongodb:${MONGO_VERSION}"
-    command: mongod --port 27017 --replSet=rs0 --dbpath /data/db
-  mongo-s-rs0-1:
-    image: "percona/percona-server-mongodb:${MONGO_VERSION}"
-    command: mongod --port 27017 --replSet=rs0 --shardsvr --dbpath /data/db
-  mongo-s-rs0-2:
-    image: "percona/percona-server-mongodb:${MONGO_VERSION}"
-    command: mongod --port 27017 --replSet=rs0 --shardsvr --dbpath /data/db
+    command: mongod --port=27017 --replSet=rs0 --dbpath=/data/db ${DATA_MONGOD_FLAGS}
   mongo-cs-1:
     image: "percona/percona-server-mongodb:${MONGO_VERSION}"
-    command: mongod --port 27017 ${CONFIGSVR_FLAGS} --configsvr --dbpath /data/db
+    command: mongod --port=27017 --configsvr --dbpath=/data/db ${CONFIGSVR_FLAGS}
   mongo-cs-2:
     image: "percona/percona-server-mongodb:${MONGO_VERSION}"
-    command: mongod --port 27017 ${CONFIGSVR_FLAGS} --configsvr --dbpath /data/db
+    command: mongod --port=27017 --configsvr --dbpath=/data/db ${CONFIGSVR_FLAGS}
+  mongo-cs-3:
+    image: "percona/percona-server-mongodb:${MONGO_VERSION}"
+    command: mongod --port=27017 --configsvr --dbpath=/data/db ${CONFIGSVR_FLAGS}
   mongo-mongos:
     image: "percona/percona-server-mongodb:${MONGO_VERSION}"
-    command: mongos --port 27017 --configdb ${MONGOS_CONFIGDB}
+    command: mongos --port=27017 --configdb=${MONGOS_CONFIGDB}
     depends_on:
-    - mongo-s-rs0-1
-    - mongo-s-rs0-2
+    - mongo-rs0-1
+    - mongo-rs0-2
+    - mongo-rs0-3
     - mongo-cs-1
     - mongo-cs-2
+    - mongo-cs-3
   backup-cluster:
     image: mongodb_consistent_backup:latest
     entrypoint: mongodb-consistent-backup
-    command: --backup.location /tmp --backup.name test-cluster --host ${MONGOS_CONFIGDB} --replication.max_lag_secs 15 ${MCB_EXTRA}
+    command: --backup.location=/tmp --backup.name=test-cluster --host=${MONGOS_CONFIGDB} --replication.max_lag_secs=15 ${MCB_EXTRA}
     depends_on:
     - mongo-mongos
   backup-replset:
     image: mongodb_consistent_backup:latest
     entrypoint: mongodb-consistent-backup
-    command: --backup.location /tmp --backup.name test-replset --host rs0/mongo-rs0-1:27017,mongo-rs0-2:27017,mongo-rs0-3:27017 --replication.max_lag_secs 15 ${MCB_EXTRA}
+    command: --backup.location=/tmp --backup.name=test-replset --host=rs0/mongo-rs0-1:27017,mongo-rs0-2:27017,mongo-rs0-3:27017 --replication.max_lag_secs=15 ${MCB_EXTRA}
     depends_on:
     - mongo-rs0-1
     - mongo-rs0-2
+    - mongo-rs0-3

scripts/travis-ci/run-cluster.sh

@@ -11,19 +11,21 @@ pushd $(dirname $0)
 	source $PWD/func.sh
 
 	export MONGO_VERSION=${MONGO_VERSION}
+	export DATA_MONGOD_FLAGS="--shardsvr"
 	export MCB_EXTRA=${MCB_EXTRA}
 
 	CONFIGSVR_REPLSET=csReplSet
 	if [ "${CONFIGSVR_TYPE}" == "CSRS" ]; then
 		export CONFIGSVR_FLAGS="--replSet ${CONFIGSVR_REPLSET}"
-		export MONGOS_CONFIGDB="${CONFIGSVR_REPLSET}/mongo-cs-1:27017,mongo-cs-2:27017"
+		export MONGOS_CONFIGDB="${CONFIGSVR_REPLSET}/mongo-cs-1:27017,mongo-cs-2:27017,mongo-cs-3:27017"
 		echo "# Using CSRS-based config servers: '${MONGOS_CONFIGDB}'"
 	else
 		export CONFIGSVR_FLAGS=
 		export MONGOS_CONFIGDB="mongo-cs-1:27017,mongo-cs-2:27017"
 		echo "# Using SCCC-based config servers: '${MONGOS_CONFIGDB}'"
 	fi
 
+	# start mongo-mongos service (which starts the whole cluster)
 	echo "# Starting instances with docker-compose"
 	docker-compose up -d mongo-mongos
 
@@ -37,25 +39,27 @@ pushd $(dirname $0)
 		  configsvr: true,
 		  members: [
 		    { _id: 0, host: "mongo-cs-1:27017" },
-		    { _id: 1, host: "mongo-cs-2:27017" }
+		    { _id: 1, host: "mongo-cs-2:27017" },
+		    { _id: 1, host: "mongo-cs-3:27017" }
 		  ]
 		})'
 	fi
 
 	echo "# Initiating rs0"
-	doMongo mongo-mongos mongo-s-rs0-1:27017 'rs.initiate({
+	doMongo mongo-mongos mongo-rs0-1:27017 'rs.initiate({
 	  _id: "rs0",
 	  members: [
-	    { _id: 0, host: "mongo-s-rs0-1:27017" },
-	    { _id: 1, host: "mongo-s-rs0-2:27017", priority: 0 }
+	    { _id: 0, host: "mongo-rs0-1:27017" },
+	    { _id: 1, host: "mongo-rs0-2:27017" },
+	    { _id: 1, host: "mongo-rs0-3:27017", priority: 0 }
 	  ]
 	})'
 
 	echo "# Waiting 10 seconds"
 	sleep 10
 
 	echo "# Adding shard rs0"
-  	doMongo mongo-mongos mongo-mongos:27017 'sh.addShard("rs0/mongo-s-rs0-1:27017,mongo-s-rs0-2:27017")'
+  	doMongo mongo-mongos mongo-mongos:27017 'sh.addShard("rs0/mongo-rs0-1:27017,mongo-rs0-2:27017,mongo-rs0-3:27017")'
 
         echo "# Starting mongodb_consistent_backup, cluster mode (in docker)"
         docker-compose up --abort-on-container-exit backup-cluster

scripts/travis-ci/run-replset.sh

@@ -10,6 +10,7 @@ pushd $(dirname $0)
 	source $PWD/func.sh
 
 	export MONGO_VERSION=${MONGO_VERSION}
+	export DATA_MONGOD_FLAGS=
 	export MCB_EXTRA=${MCB_EXTRA}
 
 	echo "# Starting instances with docker-compose"