Benchmark bug fix

Author: gtbai

.gitignore

@@ -58,3 +58,7 @@
 /sock/sock-init
 /testing/test-cluster
 /my-cluster
+
+# Unknown
+output
+used_time

Makefile

@@ -56,7 +56,7 @@ GO = $(abspath ./hack/go.sh)
 GO_PATH = hack/go
 WORKER_DIR = $(GO_PATH)/src/github.com/open-lambda/open-lambda/worker
 ADMIN_DIR = $(GO_PATH)/src/github.com/open-lambda/open-lambda/worker/admin
-BENCHMARK_DIR = $(GO_PATH)/src/github.com/open-lambda/s19-lambda/benchmark/benchmark
+BENCHMARK_DIR = $(GO_PATH)/src/github.com/open-lambda/s19-lambda/benchmark
 
 LAMBDA_DIR = $(abspath ./lambda)
 PIPBENCH_DIR = $(abspath ./pipbench)
@@ -81,8 +81,8 @@ bin/admin: $(WORKER_GO_FILES)
 	cp $(GO_PATH)/bin/admin ./bin
 
 bin/benchmark: $(BENCHMARK_GO_FILES)
-    cd $(BENCHMARK_DIR) && $(GO) install
-    cp $(GO_PATH)/bin/benchmark ./bin
+	cd $(BENCHMARK_DIR) && $(GO) install
+	cp $(GO_PATH)/bin/benchmark ./bin
 
 
 .PHONY: test-all test-sock-all test-docker-all test-cluster

benchmark/benchmark_prepare.sh

@@ -3,7 +3,7 @@
 # $2 OpenLambda path
 # $3 machines list
 
-ARR=( "$@" )
+ARR=("$@")
 
 num_dumps=${ARR[0]}
 echo "number of lambda dumps: $num_dumps"

benchmark/config.json

@@ -0,0 +1,18 @@
+{
+   "host": "localhost",
+   "port": 8079,
+   "olPath": "/mnt/lambda_scheduler/s19-lambda",
+   "registryMachines": [
+         "c220g2-011027.wisc.cloudlab.us",
+         "c220g2-011025.wisc.cloudlab.us",
+         "c220g2-011026.wisc.cloudlab.us"
+
+   ],
+   "cmds": [
+      {
+         "cmd": "{'cmds':[['cpu', 10000], ['mem', 10000000, 0.5]]}",
+         "numThreads": 20,
+         "totalCmds": 400
+      }
+   ]
+}

benchmark/lambda/index.py benchmark/lambda/lambda_func.py

@@ -52,7 +52,7 @@ type PerfMetrics struct{
 
 
 var LAMBDA_BASE = "lambda-"
-var BENCHMARK_PREPARE_SCRIPT = "benchmark_prepare.sh"
+var BENCHMARK_PREPARE_SCRIPT = "/mnt/lambda_scheduler/s19-lambda/benchmark/benchmark_prepare.sh"
 
 // WorkerPools consists a list of WorkerPool, one WorkerPool for each
 // Command in the corresponding config file.
@@ -72,12 +72,12 @@ func startBenchmark(ctx *cli.Context) error {
 	}
 
 	cmdLineOut, err := prepBenchmark(*benchmarkConfig)
+	fmt.Printf("%s", cmdLineOut)
 	if err != nil {
-		fmt.Println("Failed to execute run_benchmark.sh")
+		fmt.Println("Failed to execute prepare_benchmark.sh")
 		log.Fatalln(err)
 		return err
 	}
-	log.Printf("%s", cmdLineOut)
 
 	genWorkload(*benchmarkConfig)
 
@@ -107,7 +107,8 @@ func prepBenchmark(config BenchmarkConfig) ([]byte, error) {
 	params := append(scriptName, numCommands...)
 	params = append(params, olPath...)
 	params = append(params, registryMachines...)
-	return exec.Command("/bin/sh", params...).Output()
+	//fmt.Println(exec.Command("/bin/sh", "ls").Output())
+	return exec.Command("/bin/bash", params...).CombinedOutput()
 }
 
 // Generate synthetic workload based on benchmark config
@@ -132,7 +133,7 @@ func genWorkload(config BenchmarkConfig) {
 	for i := 0; i < numCommands; i++ {
 		// Create Job template
 		job := &Job{}
-		job.url = url
+		job.url = url + "/" + LAMBDA_BASE + strconv.Itoa(i)
 		job.cmds = config.Cmds[i].Cmd
 		job.lambda = LAMBDA_BASE + string(i)
 		addLambdaRequests(WorkerPools[i], job)
@@ -187,6 +188,7 @@ func singleLambdaRequest(job Job) int64 {
 	_, err := http.Post(job.url, "text/plain", bytes.NewBufferString(job.cmds))
 	if err != nil {
 		log.Fatalln(err)
+		fmt.Println(err)
 	}
 	end_time := time.Now().UnixNano()
 	return end_time - start_time
@@ -230,4 +232,4 @@ OPTIONS:
 	if err != nil {
 		log.Fatal(err)
 	}
-}
+}

benchmark/main.go

@@ -0,0 +1 @@
+/mnt/lambda_scheduler/s19-lambda/benchmark