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/17 21:12:20 UTC
[10/50] [abbrv] incubator-usergrid git commit: loadtests: seperating
setup from notifications
loadtests: seperating setup from notifications
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c282d80a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c282d80a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c282d80a
Branch: refs/heads/two-dot-o-events
Commit: c282d80a3be87f240b56e680e7cb57224576acc9
Parents: a3b517b
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Nov 10 15:29:13 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Nov 10 15:29:13 2014 -0700
----------------------------------------------------------------------
stack/loadtests/README.md | 4 ++--
.../org/apache/usergrid/scenarios/NotificationScenarios.scala | 2 ++
.../src/main/scala/org/apache/usergrid/settings/Settings.scala | 6 ++----
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c282d80a/stack/loadtests/README.md
----------------------------------------------------------------------
diff --git a/stack/loadtests/README.md b/stack/loadtests/README.md
index f5f72ad..b207ab4 100644
--- a/stack/loadtests/README.md
+++ b/stack/loadtests/README.md
@@ -6,7 +6,7 @@ Gatling will run through mvn
1. execute mvn gatling:execute with these options
*Required
- > -Dthrottle={maxReqsSec} -Dduration={durationInSecs} -Dorg={org} -Dapp={appName} -Dbaseurl={uriNoProceedingSlash} -DnumEntities={numberOfEntitiesYouWantToCreateInteger} -DrampUsers={totalUsersInteger} -DrampTime={rampTimeIntegerSeconds} -DadminUser={username} -DadminPassword={pwd} -Dgatling.simulationClass={simulationFQDN}
+ > -Dthrottle={maxReqsSec} -Dduration={durationInSecs} -Dorg={org} -Dapp={appName} -Dbaseurl={uriNoProceedingSlash} -DnumEntities={numberOfEntitiesYouWantToCreateInteger} -DmaxPossibleUsers={totalUsersInteger} -DrampTime={rampTimeIntegerSeconds} -DadminUser={username} -DadminPassword={pwd} -Dgatling.simulationClass={simulationFQDN}
*Addional optional settings
@@ -15,7 +15,7 @@ Gatling will run through mvn
skipSetup will skip the setup steps
So running will look something like this
- >mvn gatling:execute -Dthrottle=100 -Dduration=300 -Dorg=usergrid -Dapp=load -Dbaseurl=http://load.usergrid.com -DnumEntities=300 -DrampUsers=600 -DrampTime=30 -DadminUser=usergrid -DadminPassword=test -Dgatling.simulationClass=org.apache.usergrid.simulations.AppSimulation
+ >mvn gatling:execute -Dthrottle=100 -Dduration=300 -Dorg=usergrid -Dapp=load -Dbaseurl=http://load.usergrid.com -DnumEntities=300 -DmaxPossibleUsers=600 -DrampTime=30 -DadminUser=usergrid -DadminPassword=test -Dgatling.simulationClass=org.apache.usergrid.simulations.AppSimulation
Setting the users and duration => Injects a given number of users with a linear ramp over a given duration. users must be greater than duration
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c282d80a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
index 6ed5625..61b2605 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
@@ -71,6 +71,8 @@ object NotificationScenarios {
val userFeeder = Settings.getInfiniteUserFeeder()
val createScenario = scenario("Create Push Notification")
.feed(userFeeder)
+ .exec(TokenScenarios.getUserToken)
+ .exec(UserScenarios.getUserByUsername)
.exec( sendNotificationToUser)
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c282d80a/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 4bcb6bb..0e9781c 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
@@ -35,13 +35,11 @@ object Settings {
val skipSetup:Boolean = System.getProperty("skipSetup") == "true"
val duration:Int = Integer.getInteger("duration", 300).toInt // in seconds
- // Simulation settings
- val constantUsers:Int = Integer.getInteger("rampUsers", 10).toInt
- val numUsers:Int = constantUsers * duration
// Simulation settings
val maxPossibleUsers:Int = Integer.getInteger("maxPossibleUsers", 10).toInt
+ val numUsers:Int = maxPossibleUsers
val numEntities:Int = Integer.getInteger("numEntities", 5000).toInt
val numDevices:Int = Integer.getInteger("numDevices", 4000).toInt
@@ -59,7 +57,7 @@ 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 $maxPossibleUsers users per sec")
def getUserFeeder():Array[Map[String, String]]= {
val userFeeder = FeederGenerator.generateUserWithGeolocationFeeder(numUsers, userLocationRadius, centerLatitude, centerLongitude)