Merge pull request #42 from showwin/fix_isolated_bench

Benchmarkerはアプリケーションとは別のDBを参照

Makefile

@@ -70,7 +70,7 @@ bench:
 bench-with-db-init:
 	docker exec -i ishocon1-bench-1 sh -c " \
 		service mysql restart && \
-		tar -zxvf ~/admin/ishocon1.dump.tar.gz -C ~/admin && mysql -u root -pishocon ishocon1 < ~/admin/ishocon1.dump && \
+		tar -zxvf ~/admin/ishocon1.dump.tar.gz -C ~/admin && mysql -u root -pishocon ishocon1_bench < ~/admin/ishocon1.dump && \
 		./benchmark --ip app:80 --workload ${WORKLOAD} \
 	";
 

admin/benchmarker/main.go

@@ -41,7 +41,7 @@ func getEnv(key, fallback string) string {
 func getDB() (*sql.DB, error) {
 	user := getEnv("ISHOCON1_DB_USER", "ishocon")
 	pass := getEnv("ISHOCON1_DB_PASSWORD", "ishocon")
-	dbname := getEnv("ISHOCON1_DB_NAME", "ishocon1")
+	dbname := getEnv("ISHOCON1_DB_NAME", "ishocon1_bench")
 	db, err := sql.Open("mysql", user+":"+pass+"@/"+dbname)
 	return db, err
 }

ami/scripts/benchmarker.sh

@@ -7,3 +7,9 @@ cd /tmp/
 tar -zxvf /tmp/benchmarker.tar.gz
 cd /tmp/benchmarker
 go build -x -o /home/ishocon/benchmark *.go
+
+# Load data into MySQL
+sudo mysql -u root -pishocon1 -e 'CREATE DATABASE IF NOT EXISTS ishocon1_bench;'
+sudo mysql -u root -pishocon1 -e "CREATE USER IF NOT EXISTS ishocon IDENTIFIED BY 'ishocon';"
+sudo mysql -u root -pishocon1 -e 'GRANT ALL ON *.* TO ishocon;'
+tar -zxvf ~/data/ishocon1.dump.tar.gz -C ~/data && sudo mysql -u root -pishocon1 ishocon1_bench < ~/data/ishocon1.dump

docker/benchmarker/Dockerfile

@@ -34,10 +34,10 @@ RUN ["/bin/bash", "-c", "debconf-set-selections <<< 'mysql-service mysql-server/
 
 # 初期データ投入
 RUN service mysql start && \
-    mysql -u root -pishocon -e 'CREATE DATABASE IF NOT EXISTS ishocon1;' && \
+    mysql -u root -pishocon -e 'CREATE DATABASE IF NOT EXISTS ishocon1_bench;' && \
     mysql -u root -pishocon -e "CREATE USER IF NOT EXISTS ishocon IDENTIFIED BY 'ishocon';" && \
     mysql -u root -pishocon -e 'GRANT ALL ON *.* TO ishocon;' && \
-    tar -zxvf ~/admin/ishocon1.dump.tar.gz -C ~/admin && mysql -u root -pishocon ishocon1 < ~/admin/ishocon1.dump && \
+    tar -zxvf ~/admin/ishocon1.dump.tar.gz -C ~/admin && mysql -u root -pishocon ishocon1_bench < ~/admin/ishocon1.dump && \
     rm -rf ~/admin/ishocon1.dump