Continued work on Load testing #11

jjcollinge · Nov 14, 2017 · a2fbd32 · a2fbd32
1 parent bfdd3a6
commit a2fbd32
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/Demos/apps/loadtest/WebServicePkg/ServiceManifest.xml b/Demos/apps/loadtest/WebServicePkg/ServiceManifest.xml
@@ -5,7 +5,9 @@
       <Extensions>
           <Extension Name="Traefik">
             <Labels xmlns="http://schemas.microsoft.com/2015/03/fabact-no-schema">
-              <Label Key="traefik.frontend.rule.default">PathPrefixStrip: /v1</Label>
+              <Label Key="traefik.frontend.rule.default">PathPrefixStrip: /bignode</Label>
+              <Label Key="traefik.frontend.priority">10</Label>
+              <Label Key="traefik.backend.group.name">bignode</Label>              
               <Label Key="traefik.expose">true</Label>
             </Labels>
           </Extension>
@@ -23,7 +25,7 @@
       </EntryPoint>
       <EnvironmentVariables>
         <EnvironmentVariable Name="NODE_PORT" Value="[Port]"/>
-        <EnvironmentVariable Name="RES_STRING" Value="Hello World"/>
+        <EnvironmentVariable Name="RES_STRING" Value="[Response]"/>
       </EnvironmentVariables>
    </CodePackage>
    <Resources>

diff --git a/Testing/Cleanup.sh b/Testing/Cleanup.sh
@@ -0,0 +1,7 @@
+sfctl application list --query items[].id -o tsv | grep node | xargs -n 1 -P 12 sfctl application delete --application-id
+sfctl application unprovision --application-type-name NodeAppType --application-type-version 1.0.0
+sfctl store delete --content-path loadtest
+
+sfctl application delete --application-id traefik
+sfctl application unprovision --application-type-name TraefikType --application-type-version 1.0.0
+sfctl store delete --content-path ApplicationPackageRoot
diff --git a/Testing/Scenario1/Setup.sh b/Testing/Scenario1/Setup.sh
@@ -5,9 +5,9 @@ sfctl application create --app-type TraefikType --app-version 1.0.0 --app-name f
 
 
 sfctl application upload --path ./Demos/apps/loadtest
-sfctl application provision --application-type-build-path ./loadtest
-for i in {30..300}
+sfctl application provision --application-type-build-path loadtest
+for i in {348..500}
 do
    ( echo "Deploying instance $i"
-   sfctl application create --app-type NodeAppType --app-version 1.0.0 --parameters "{\"PORT\":\"90$i\"}" --app-name fabric:/node$i ) &
+   sfctl application create --app-type NodeAppType --app-version 1.0.0 --parameters "{\"PORT\":\"25$i\"}" --app-name fabric:/node25$i ) &
 done
diff --git a/Testing/Scenario2/Setup.sh b/Testing/Scenario2/Setup.sh
@@ -0,0 +1,16 @@
+#Traefik install
+sfctl application upload --path ./Traefik/ApplicationPackageRoot/
+sfctl application provision --application-type-build-path ApplicationPackageRoot
+sfctl application create --app-type TraefikType --app-version 1.0.0 --app-name fabric:/traefik
+
+#Spin up some node apps
+sfctl application upload --path ./Demos/apps/loadtest
+sfctl application provision --application-type-build-path loadtest
+for i in {100..120}
+do
+   ( echo "Deploying instance $i"
+   sfctl application create --app-type NodeAppType --app-version 1.0.0 --parameters "{\"PORT\":\"25$i\", \"RESPONSE\":\"25$i\"}" --app-name fabric:/node25$i ) &
+done
+
+
+#Run load test
diff --git a/Traefik/ApplicationPackageRoot/TraefikPkg/Code/traefik.toml b/Traefik/ApplicationPackageRoot/TraefikPkg/Code/traefik.toml
@@ -75,6 +75,15 @@ address = ":80"
 #
 address = ":9000"
 
+# To enable Traefik to export internal metrics to Prometheus
+[web.metrics.prometheus]
+
+# Buckets for latency metrics
+#
+# Optional
+# Default: [0.1, 0.3, 1.2, 5]
+buckets=[0.1,0.3,1.2,5.0]
+
 ################################################################
 # Service Fabric provider
 ################################################################