Merge branch 'load-gen-new' of https://github.com/vhive-serverless/vS…

…warm into load-gen-new

Signed-off-by: Lakshman <Lakshman@localhost>

tools/load-generator/invoker/measure.go

@@ -1,15 +1,35 @@
-invoker: client.go measure.go helloworld.pb.go helloworld_grpc.pb.go
-	go mod tidy
-	go build github.com/vhive-serverless/vSwarm/tools/invoker
-
-helloworld.pb.go: proto/helloworld.proto
-	protoc \
-		--go_out=. \
-		--go_opt="paths=source_relative" \
-		proto/helloworld.proto
-
-helloworld_grpc.pb.go: proto/helloworld.proto
-	protoc \
-		--go-grpc_out=. \
-		--go-grpc_opt="paths=source_relative" \
-		proto/helloworld.proto
+package main
+
+import (
+	// "context"
+	"sync"
+	"time"
+
+	// "github.com/golang/protobuf/ptypes/empty"
+	// log "github.com/sirupsen/logrus"
+	// "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
+	"google.golang.org/grpc"
+	// "google.golang.org/grpc/credentials/insecure"
+
+	"github.com/vhive-serverless/vSwarm/tools/benchmarking_eventing/proto"
+
+	// "github.com/vhive-serverless/vSwarm/tools/endpoint"
+)
+
+var (
+	tsdbConn   *grpc.ClientConn
+	tsdbClient proto.TimeseriesClient
+	lock       sync.Mutex
+)
+
+func Start() {
+	lock.Lock()
+	defer lock.Unlock()
+	return
+}
+
+func End() (durations []time.Duration) {
+	lock.Lock()
+	defer lock.Unlock()
+	return
+}

tools/load-generator/load_generator/deployer.py

@@ -232,6 +232,7 @@ def deploy_service(
 
         # Execute the shell script and deploy the function
         execute_shell = f"{shell_path} {shell_filename}"
+        log.info(f"Executing {shell_filename}")
         try:
             result = subprocess.run(
                 execute_shell,
@@ -285,6 +286,7 @@ def get_service_status(function_names: list) -> bool:
                         if status == "True":
                             service_status[function_name] = True
                         else:
+                            log.info(f"Service {function_name} is not ready")
                             service_status[function_name] = False
 
             for function_name in function_names:
@@ -391,6 +393,7 @@ def get_service_status(function_names: list) -> bool:
         if e == 0: deployed_services_names.append(tf["proxy-function-name"])
 
         if(len(deployed_services_names) % 50 == 49):
+            log.info("Waiting for 15 seconds, monitoring the service status")
 
             # Monitor the service, until it is ready
             # Monitoring happens every 15 seconds. If it shows failure even after that then it returns failure

tools/load-generator/requirements.txt

@@ -4,4 +4,5 @@ typing
 matplotlib 
 argparse 
 PyYAML 
-scipy
+scipy
+tqdm

tools/load-generator/yamls/aes-go/kn-aes-go-10-10.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-100-101.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-1000-1010.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-10000-10100.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-100000-101000.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-1000000-1010000.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-2000-2020.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-20000-20200.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-200000-202000.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-4500-4545.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-45000-45450.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-450000-454500.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-500-505.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-7000-7070.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-70000-70700.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-go/kn-aes-go-700000-707000.yaml

@@ -25,3 +25,5 @@ spec:
         - image: docker.io/vhiveease/aes-go:latest
           args:
             - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-10-10.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-100-101.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-1000-1010.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-10000-10100.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-100000-101000.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-1000000-1010000.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-2000-2020.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-20000-20200.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-200000-202000.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-4500-4545.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-45000-45450.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-450000-454500.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-500-505.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-7000-7070.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-70000-70700.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-nodejs/kn-aes-nodejs-700000-707000.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-10-10.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-100-101.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-1000-1010.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-10000-10100.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-100000-101000.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-1000000-1010000.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-2000-2020.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-20000-20200.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-200000-202000.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-4500-4545.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-45000-45450.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-450000-454500.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-500-505.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-7000-7070.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-70000-70700.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/aes-python/kn-aes-python-700000-707000.yaml

@@ -26,3 +26,5 @@ spec:
           args:
             - --addr=0.0.0.0
             - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/auth/kn-auth-go.yaml

@@ -41,4 +41,6 @@ spec:
             - --profile-function=true
         - image: docker.io/vhiveease/auth-go:latest
           args:
-            - --addr=0.0.0.0:50051
+            - --addr=0.0.0.0:50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/auth/kn-auth-nodejs.yaml

@@ -42,4 +42,6 @@ spec:
         - image: docker.io/vhiveease/auth-nodejs:latest
           args:
             - --addr=0.0.0.0
-            - --port=50051
+            - --port=50051
+      nodeSelector:
+        node-role: perfer

tools/load-generator/yamls/auth/kn-auth-python.yaml

@@ -42,4 +42,6 @@ spec:
         - image: docker.io/vhiveease/auth-python:latest
           args:
             - --addr=0.0.0.0
-            - --port=50051
+            - --port=50051
+      nodeSelector:
+        node-role: perfer