You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/11/08 01:38:02 UTC
incubator-usergrid git commit: Testing simulation changes
Repository: incubator-usergrid
Updated Branches:
refs/heads/toddtest [created] da30cac26
Testing simulation changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/da30cac2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/da30cac2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/da30cac2
Branch: refs/heads/toddtest
Commit: da30cac26241a9c4113b20973e5fbbba8599a578
Parents: 4436ead
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Nov 7 17:37:59 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Nov 7 17:37:59 2014 -0700
----------------------------------------------------------------------
.../scala/org/apache/usergrid/scenarios/GeoScenarios.scala | 2 +-
.../main/scala/org/apache/usergrid/settings/Settings.scala | 8 ++++----
.../org/apache/usergrid/simulations/AppSimulation.scala | 4 ++--
.../apache/usergrid/simulations/ConnectionsSimulation.scala | 2 +-
.../apache/usergrid/simulations/GetEntitySimulation.scala | 2 +-
.../apache/usergrid/simulations/PostUsersSimulation.scala | 2 +-
.../simulations/PushNotificationTargetUserSimulation.scala | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da30cac2/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
index d5ce7c7..3f02a71 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
@@ -39,7 +39,7 @@ import io.gatling.http.Predef._
val updateGeolocation = exec(
http("PUT user location")
- .put("/users/user" + Utils.generateRandomInt(1, Settings.numUsers))
+ .put("/users/user" + Utils.generateRandomInt(1, Settings.maxUsers))
.body(StringBody("{\"location\":{\"latitude\":\"${latitude}\",\"longitude\":\"${longitude}\"}}"))
.headers(Headers.jsonAuthorized)
.check(status.is(200))
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da30cac2/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
index 67faccd..b2101ac 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
@@ -36,9 +36,9 @@ object Settings {
val duration:Int = Integer.getInteger("duration", 300).toInt // in seconds
// Simulation settings
- val constantUsers:Int = Integer.getInteger("rampUsers", 10).toInt
+ val maxUsers:Int = Integer.getInteger("maxUsers", 10).toInt
- var numUsers:Int = constantUsers * duration
+// var numUsers:Int = rampUsers * duration
val numEntities:Int = Integer.getInteger("numEntities", 5000).toInt
val numDevices:Int = Integer.getInteger("numDevices", 4000).toInt
@@ -56,10 +56,10 @@ object Settings {
val pushNotifier = if (System.getProperty("pushNotifier") != null) System.getProperty("pushNotifier") else "loadNotifier"
val pushProvider = if (System.getProperty("pushProvider") != null) System.getProperty("pushProvider") else "noop"
- println(s"Will inject $constantUsers users per sec")
+ println(s"Will inject $rampUsers users per sec")
def getUserFeeder():Array[Map[String, String]]= {
- val userFeeder = FeederGenerator.generateUserWithGeolocationFeeder(numUsers, userLocationRadius, centerLatitude, centerLongitude)
+ val userFeeder = FeederGenerator.generateUserWithGeolocationFeeder(rampUsers, userLocationRadius, centerLatitude, centerLongitude)
return userFeeder
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da30cac2/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/AppSimulation.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/AppSimulation.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/AppSimulation.scala
index 48fff1c..03eb476 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/AppSimulation.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/AppSimulation.scala
@@ -41,8 +41,8 @@ class AppSimulation extends Simulation {
setUp(
NotificationScenarios.createScenario
- .inject(constantUsersPerSec(Settings.constantUsers) during (Settings.duration)) // wait for 15 seconds so create org can finish, need to figure out coordination
- .throttle(reachRps(Settings.throttle) in (Settings.rampTime.seconds))
+ .inject(constantUsersPerSec(Settings.maxUsers) during (Settings.rampTime)) // wait for 15 seconds so create org can finish, need to figure out coordination
+ .throttle(reachRps(Settings.throttle) in (Settings.rampTime.seconds), holdFor(Settings.duration))
.protocols(Settings.httpConf.acceptHeader("application/json"))
)
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da30cac2/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/ConnectionsSimulation.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/ConnectionsSimulation.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/ConnectionsSimulation.scala
index efc3c69..a617c22 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/ConnectionsSimulation.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/ConnectionsSimulation.scala
@@ -45,7 +45,7 @@ class ConnectionsSimulation extends Simulation{
setUp(
ConnectionScenarios.createScenario
- .inject(constantUsersPerSec(Settings.constantUsers) during (Settings.duration)) // wait for 15 seconds so create org can finish, need to figure out coordination
+ .inject(constantUsersPerSec(Settings.rampUsers) during (Settings.duration)) // wait for 15 seconds so create org can finish, need to figure out coordination
.throttle(reachRps(Settings.throttle) in ( Settings.rampTime.seconds))
.protocols( Settings.httpConf.acceptHeader("application/json"))
)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da30cac2/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
index 7b9df21..dddfaac 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
@@ -29,7 +29,7 @@ class GetEntitySimulation extends Simulation {
val httpConf = Settings.httpConf
// Simulation settings
- val numUsers:Int = Settings.numUsers
+ val numUsers:Int = Settings.maxUsers
val numEntities:Int = Settings.numEntities
val rampTime:Int = Settings.rampTime
val throttle:Int = Settings.throttle
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da30cac2/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
index cbac041..2ef7190 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
@@ -29,7 +29,7 @@ class PostUsersSimulation extends Simulation {
val httpConf = Settings.httpConf
// Simulation settings
- val numUsers:Int = Settings.numUsers
+ val numUsers:Int = Settings.maxUsers
val rampTime:Int = Settings.rampTime
val throttle:Int = Settings.throttle
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da30cac2/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala
index 510cee1..34b971c 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala
@@ -35,7 +35,7 @@ class PushNotificationTargetUserSimulation extends Simulation {
}
setUp(
NotificationScenarios.createScenario
- .inject(constantUsersPerSec(Settings.constantUsers) during (Settings.duration)) // wait for 15 seconds so create org can finish, need to figure out coordination
+ .inject(constantUsersPerSec(Settings.rampUsers) during (Settings.duration)) // wait for 15 seconds so create org can finish, need to figure out coordination
.throttle(reachRps(Settings.throttle) in ( Settings.rampTime.seconds))
.protocols( Settings.httpConf.acceptHeader("application/json"))
)