updated locust version

igalonso · Jun 13, 2023 · f994277 · f994277
1 parent 5839f5d
commit f994277
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 67 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@
 /v2/load-generator/stop.sh
 /v2/load-generator/test.sh
 /v2/load-generator/backend/_pycache_/*
-/v2/load-generator/backend/services/_pycache_/*
+/v2/load-generator/backend/services/*/_pycache_/*
 /v2/load-generator/config/targetservers/edge.json
 /v2/load-generator/config/targetservers/edge.json.backup
 /v2/load-generator/config/edge.json
@@ -49,4 +49,5 @@
 /v1/load-generator/proxies/Load-Generator-User/config.json
 /v1/load-generator-key*
 /v1/start*
-/v1/stop*
+/v1/stop*
+.buildt
diff --git a/v2/load-generator/backend/services/catalog/__pycache__/catalog.cpython-39.pyc b/v2/load-generator/backend/services/catalog/__pycache__/catalog.cpython-39.pyc
diff --git a/v2/load-generator/backend/services/catalog/requirements.txt b/v2/load-generator/backend/services/catalog/requirements.txt
@@ -1,3 +1,4 @@
+markupsafe==2.0.1
 Flask==1.1.4
 # opencensus-ext-stackdriver 0.7.4 depends on google-cloud-monitoring<1.0.0 and >=0.30.0
 google-cloud-monitoring==0.36.0

diff --git a/v2/load-generator/backend/services/checkout/__pycache__/checkout.cpython-39.pyc b/v2/load-generator/backend/services/checkout/__pycache__/checkout.cpython-39.pyc
diff --git a/v2/load-generator/backend/services/checkout/requirements.txt b/v2/load-generator/backend/services/checkout/requirements.txt
@@ -1,3 +1,4 @@
+markupsafe==2.0.1
 Flask==1.1.4
 # opencensus-ext-stackdriver 0.7.4 depends on google-cloud-monitoring<1.0.0 and >=0.30.0
 google-cloud-monitoring==0.36.0

diff --git a/v2/load-generator/backend/services/default/requirements.txt b/v2/load-generator/backend/services/default/requirements.txt
@@ -1,3 +1,4 @@
+markupsafe==2.0.1
 Flask==1.1.4
 # opencensus-ext-stackdriver 0.7.4 depends on google-cloud-monitoring<1.0.0 and >=0.30.0
 google-cloud-monitoring==0.36.0

diff --git a/v2/load-generator/backend/services/loyalty/requirements.txt b/v2/load-generator/backend/services/loyalty/requirements.txt
@@ -1,3 +1,4 @@
+markupsafe==2.0.1
 Flask==1.1.4
 # opencensus-ext-stackdriver 0.7.4 depends on google-cloud-monitoring<1.0.0 and >=0.30.0
 google-cloud-monitoring==0.36.0

diff --git a/v2/load-generator/backend/services/users/__pycache__/user.cpython-39.pyc b/v2/load-generator/backend/services/users/__pycache__/user.cpython-39.pyc
diff --git a/v2/load-generator/backend/services/users/requirements.txt b/v2/load-generator/backend/services/users/requirements.txt
@@ -1,3 +1,4 @@
+markupsafe==2.0.1
 Flask==1.1.4
 # opencensus-ext-stackdriver 0.7.4 depends on google-cloud-monitoring<1.0.0 and >=0.30.0
 google-cloud-monitoring==0.36.0

diff --git a/v2/load-generator/config/edge.json.template b/v2/load-generator/config/edge.json.template
@@ -49,7 +49,7 @@
                     "Load-Generator-Recommendation",
                     "Load-Generator-Users"
                 ],
-                "quota": "300",
+                "quota": "3000",
                 "quotaInterval": "1",
                 "quotaTimeUnit": "hour",
                 "scopes": []
@@ -71,7 +71,7 @@
                 "proxies": [
                     "Load-Generator-Catalog"
                 ],
-                "quota": "1000",
+                "quota": "10000",
                 "quotaInterval": "1",
                 "quotaTimeUnit": "hour",
                 "scopes": []
@@ -94,7 +94,7 @@
                     "Load-Generator-Checkout",
                     "Load-Generator-Catalog"
                 ],
-                "quota": "50",
+                "quota": "100",
                 "quotaInterval": "1",
                 "quotaTimeUnit": "hour",
                 "scopes": []

diff --git a/v2/load-generator/consumers/load-test.sh b/v2/load-generator/consumers/load-test.sh
@@ -15,5 +15,11 @@ if [ $WORKLOAD_LEVEL = "low" ]; then
     concurrent=1
     requests=5
 fi
+if [ $WORKLOAD_LEVEL = "test" ]; then
+    concurrent=1
+    requests=1
+fi
 
-env TOKEN=$GCP_TOKEN APIGEE_ORG=$APIGEE_ORG APIGEE_ENV=$APIGEE_ENV locust --host=https://$HOST/v1 --no-web -c $concurrent -r $requests -f locust-load.py
+echo "Requests: "+ $requests
+echo $concurrent
+env TOKEN=$GCP_TOKEN APIGEE_ORG=$APIGEE_ORG APIGEE_ENV=$APIGEE_ENV locust --host=https://$HOST/v1 --headless -u $concurrent -r $requests -f locust-load.py
diff --git a/v2/load-generator/consumers/locust-load.py b/v2/load-generator/consumers/locust-load.py
@@ -2,7 +2,8 @@
 import requests
 import os
 import json
-from locust import HttpLocust, TaskSet
+import time
+from locust import HttpUser, task, between
 
 
 
@@ -143,60 +144,64 @@ def returnPayload():
     else:
         return {"content":"something"}
 
-def starting(l):
-    print("Starting load")
 
-#Catalog functions
-def catalogGetList(l):
-    l.client.get("/catalog?apikey="+selectRandomApp("catalog") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-def catalogGet(l):
-    l.client.get("/catalog/"+randomNum()+"?apikey="+selectRandomApp("catalog") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-def catalogPost(l):
-    l.client.post("/catalog?apikey="+selectRandomApp("catalog"),{"product":"this is a new product"} ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-
-#Checkout functions
-
-def checkoutGetList(l):
-    l.client.get("/checkout?apikey="+selectRandomApp("checkout") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-def checkoutGet(l):
-    l.client.get("/checkout/"+randomNum()+"?apikey="+selectRandomApp("checkout") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-def checkoutPost(l):
-    l.client.post("/checkout?apikey="+selectRandomApp("checkout"),{"cart":"this is a new cart"} ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-
-#Loyalty functions
-
-def loyaltyGetList(l):
-    l.client.get("/loyalty?apikey="+selectRandomApp("loyalty") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-def loyaltyGet(l):
-    l.client.get("/loyalty/"+randomNum()+"?apikey="+selectRandomApp("loyalty") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-def loyaltyPost(l):
-    l.client.post("/loyalty?apikey="+selectRandomApp("loyalty"),{"loyalty":"this is a new loyalty"} ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-
-#Loyalty functions
-
-def recommendationGetList(l):
-    l.client.get("/recommendation?apikey="+selectRandomApp("recommendation") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-def recommendationGet(l):
-    l.client.get("/recommendation/"+randomNum()+"?apikey="+selectRandomApp("recommendation") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-def recommendationPost(l):
-    l.client.post("/recommendation?apikey="+selectRandomApp("recommendation"),returnPayload() ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-
-#Loyalty functions
-
-def userGetList(l):
-    l.client.get("/user?apikey="+selectRandomApp("user") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-def userGet(l):
-    l.client.get("/user/"+randomNum()+"?apikey="+selectRandomApp("user") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-def userPost(l):
-    l.client.post("/user?apikey="+selectRandomApp("user"),returnPayload() ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)})
-
-
-class UserBehavior(TaskSet):
-
-    def on_start(self):
-        self.client.verify = False
-        starting(self)
 
+class MyUser(HttpUser):
+
+
+    def catalogGetList(self):
+        url = "/catalog/"+randomNum()+"?apikey="+selectRandomApp("catalog")
+        response = self.client.get(url,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+        time.sleep(1)
+
+    def catalogGet(self):
+        self.client.get("/catalog/"+randomNum()+"?apikey="+selectRandomApp("catalog") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+
+    def catalogPost(self):
+        self.client.post("/catalog?apikey="+selectRandomApp("catalog"),{"product":"this is a new product"} ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+
+    #Checkout functions
+
+    def checkoutGetList(l):
+        l.client.get("/checkout?apikey="+selectRandomApp("checkout") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+        time.sleep(1)
+
+    def checkoutGet(l):
+        l.client.get("/checkout/"+randomNum()+"?apikey="+selectRandomApp("checkout") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+
+    def checkoutPost(l):
+        l.client.post("/checkout?apikey="+selectRandomApp("checkout"),{"cart":"this is a new cart"} ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+
+    #Loyalty functions
+
+    def loyaltyGetList(l):
+        l.client.get("/loyalty?apikey="+selectRandomApp("loyalty") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+        time.sleep(1)
+
+    def loyaltyGet(l):
+        l.client.get("/loyalty/"+randomNum()+"?apikey="+selectRandomApp("loyalty") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+    def loyaltyPost(l):
+        l.client.post("/loyalty?apikey="+selectRandomApp("loyalty"),{"loyalty":"this is a new loyalty"} ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+
+    #Loyalty functions
+
+    def recommendationGetList(l):
+        l.client.get("/recommendation?apikey="+selectRandomApp("recommendation") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+        time.sleep(1)
+    def recommendationGet(l):
+        l.client.get("/recommendation/"+randomNum()+"?apikey="+selectRandomApp("recommendation") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+    def recommendationPost(l):
+        l.client.post("/recommendation?apikey="+selectRandomApp("recommendation"),returnPayload() ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+
+    #Loyalty functions
+
+    def userGetList(l):
+        l.client.get("/user?apikey="+selectRandomApp("user") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+        time.sleep(1)
+    def userGet(l):
+        l.client.get("/user/"+randomNum()+"?apikey="+selectRandomApp("user") ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
+    def userPost(l):
+        l.client.post("/user?apikey="+selectRandomApp("user"),returnPayload() ,headers={"Load-Generator-Version": "2.1","User-Agent":  random.choice(agents),"X-Forwarded-For": random.choice(ips)}, verify=False)
     tasks = {
         loyaltyGetList: 1, 
         loyaltyGet: 5,
@@ -213,7 +218,7 @@ def on_start(self):
         catalogGet: 8, 
         catalogGetList: 3, 
         catalogPost: 1}
-class WebsiteUser(HttpLocust):
-    task_set = UserBehavior
-    min_wait=5000
-    max_wait=9000
+    wait_time = between(0.5, 10)    
+
+if __name__ == "__main__":
+    locust.main()
diff --git a/v2/load-generator/consumers/requirements.txt b/v2/load-generator/consumers/requirements.txt
@@ -1,3 +1,2 @@
-locustio==0.9.0
-Flask==1.1.1
-gevent==1.4.0
+locust
+Flask==2.2.2
diff --git a/v2/load-generator/launch.sh b/v2/load-generator/launch.sh
@@ -114,7 +114,7 @@ if [ $DEPLOYMENT == "all" ] || [ $DEPLOYMENT == "gcp" ]; then
         gcloud builds submit --tag gcr.io/$GPROJECT_GCP/load-test
         gcloud compute addresses create $(echo "v2-1-load-locust-ip-"$RAND) --region europe-west2
         ADDR=$(gcloud compute addresses describe v2-1-load-locust-ip-$(echo $RAND) --region europe-west2 --format json | jq -r '.address')
-        gcloud compute instances create-with-container $(echo "v2-1-load-locust-"$RAND) --machine-type=e2-standard-2 --container-image gcr.io/$GPROJECT_GCP/load-test --address $ADDR --zone europe-west2-b 
+        gcloud compute instances create-with-container $(echo "v2-1-load-locust-"$RAND) --machine-type=e2-standard-2 --container-image gcr.io/$GPROJECT_GCP/load-test --address $ADDR --zone europe-west2-b --subnet=default
 fi