usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdun...@apache.org
Subject usergrid git commit: USERGRID-1044: set default retry count to 0 also, retry count was being used as the total number of attempts
Date Tue, 20 Oct 2015 20:38:11 GMT
Repository: usergrid
Updated Branches:
  refs/heads/USERGRID-1044 2f307a750 -> 1195ce85f


USERGRID-1044: set default retry count to 0
also, retry count was being used as the total number of attempts


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1195ce85
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1195ce85
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1195ce85

Branch: refs/heads/USERGRID-1044
Commit: 1195ce85fefcc8334b38f6e79cc8a2c53ce9ce10
Parents: 2f307a7
Author: Mike Dunker <mdunker@apigee.com>
Authored: Tue Oct 20 13:37:34 2015 -0700
Committer: Mike Dunker <mdunker@apigee.com>
Committed: Tue Oct 20 13:37:34 2015 -0700

----------------------------------------------------------------------
 stack/loadtests/README.md                             |  2 +-
 .../org/apache/usergrid/enums/ConfigProperties.scala  |  2 +-
 .../apache/usergrid/scenarios/AuditScenarios.scala    |  6 +++---
 .../scenarios/EntityCollectionScenarios.scala         | 14 +++++++-------
 stack/loadtests/testConfig.sh                         |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/1195ce85/stack/loadtests/README.md
----------------------------------------------------------------------
diff --git a/stack/loadtests/README.md b/stack/loadtests/README.md
index 802c286..ec34b42 100644
--- a/stack/loadtests/README.md
+++ b/stack/loadtests/README.md
@@ -106,7 +106,7 @@ Defaults listed are those that are specified by the Usergrid Gatling code,
not n
 * uuidFilename (no default) - UUID filename for non-audit tests
 * auditUuidFilename (no default) - UUID filename for audit tests
 * failedUuidFilename (no default) - UUID filename for failed entries while auditing
-* retryCount (**5**) - number of retries of operation before giving up
+* retryCount (**0**) - number of retries of operation before giving up
 * purgeUsers (**100**) - number of entities to create at a time during loadEntities (send
this many requests, then wait for the responses)
 * laterThanTimestamp (**0**) - if specified for an audit, will only match entities modified
>= this timestamp; can be used for incremental audits
 * entityProgressCount (**10000**) - print to console every time this many requests has been
sent (if entityProgressCount = 10000, will print on the 1000th, 2000th, 3000th... request)

http://git-wip-us.apache.org/repos/asf/usergrid/blob/1195ce85/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
index f74222e..cbb484c 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
@@ -153,7 +153,7 @@ object ConfigProperties {
         case FailedUuidFilename => "/tmp/dummyFailedUuid.csv"
         case SandboxCollection => false
         case PurgeUsers => 100
-        case RetryCount => 5
+        case RetryCount => 0
         case LaterThanTimestamp => 0L
         case EntityProgressCount => 10000L
         case InjectionList => "rampUsers(10,60)"

http://git-wip-us.apache.org/repos/asf/usergrid/blob/1195ce85/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
index 4743536..4477338 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
@@ -100,10 +100,10 @@ object AuditScenarios {
           session
         }
         .doIf(session => session("validEntity").as[String] == "yes") {
-          tryMax(Settings.retryCount) {
+          tryMax(1+Settings.retryCount) {
             exec(getCollectionsWithoutCursor)
           }.asLongAs(stringParamExists(SessionVarCursor)) {
-            tryMax(Settings.retryCount) {
+            tryMax(1+Settings.retryCount) {
               exec(getCollectionsWithCursor)
             }
           }
@@ -252,7 +252,7 @@ object AuditScenarios {
     .asLongAs(session => session("validEntity").asOption[String].map(validEntity =>
validEntity != "no").getOrElse[Boolean](true)) {
     feed(FeederGenerator.collectionCsvFeeder)
       .doIf(session => session("validEntity").as[String] == "yes") {
-        tryMax(Settings.retryCount) {
+        tryMax(1+Settings.retryCount) {
           exec(getCollectionEntity)
         }
       }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/1195ce85/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityCollectionScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityCollectionScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityCollectionScenarios.scala
index f717f16..b56917a 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityCollectionScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityCollectionScenarios.scala
@@ -129,7 +129,7 @@ object EntityCollectionScenarios {
     .exec(injectAuthType())
     .doIfOrElse(_ => Settings.endConditionType == EndConditionType.MinutesElapsed) {
     asLongAs(_ => Settings.continueMinutesTest) {
-      tryMax(Settings.retryCount) {
+      tryMax(1+Settings.retryCount) {
         doIfOrElse(_ => Settings.authType == AuthType.Anonymous) {
           exec(getRandomEntityAnonymous)
         } {
@@ -139,7 +139,7 @@ object EntityCollectionScenarios {
     }
   } {
     repeat(_ => Settings.endRequestCount.toInt) {
-      tryMax(Settings.retryCount) {
+      tryMax(1+Settings.retryCount) {
         doIfOrElse(_ => Settings.authType == AuthType.Anonymous) {
           exec(getRandomEntityAnonymous)
         } {
@@ -180,7 +180,7 @@ object EntityCollectionScenarios {
             session => println(s"UUID: ${session("uuid").as[String]}")
             session
             }*/
-            .tryMax(Settings.retryCount) {
+            .tryMax(1+Settings.retryCount) {
             doIfOrElse(_ => Settings.authType == AuthType.Anonymous) {
               exec(getRandomEntityByUuidAnonymous)
             } {
@@ -195,7 +195,7 @@ object EntityCollectionScenarios {
             session => println(s"UUID: ${session("uuid").as[String]}")
             session
             }*/
-            .tryMax(Settings.retryCount) {
+            .tryMax(1+Settings.retryCount) {
               doIfOrElse(_ => Settings.authType == AuthType.Anonymous) {
                 exec(getRandomEntityByUuidAnonymous)
               } {
@@ -238,7 +238,7 @@ object EntityCollectionScenarios {
           session
         }*/
         .doIf(session => session("validEntity").as[String] == "yes") {
-          tryMax(Settings.retryCount) {
+          tryMax(1+Settings.retryCount) {
             exec(loadEntity)
           }
         }
@@ -266,7 +266,7 @@ object EntityCollectionScenarios {
         session
       }*/
       .doIf(session => session("validEntity").as[String] == "yes") {
-        tryMax(Settings.retryCount) {
+        tryMax(1+Settings.retryCount) {
           exec(deleteEntity)
         }
       }
@@ -350,7 +350,7 @@ object EntityCollectionScenarios {
           session
         }*/
         .doIf(session => session("validEntity").as[String] == "yes") {
-          tryMax(Settings.retryCount) {
+          tryMax(1+Settings.retryCount) {
             doIfOrElse(_ => Settings.authType == AuthType.Anonymous) {
               exec(getEntityByNameSequentialAnonymous)
             } {

http://git-wip-us.apache.org/repos/asf/usergrid/blob/1195ce85/stack/loadtests/testConfig.sh
----------------------------------------------------------------------
diff --git a/stack/loadtests/testConfig.sh b/stack/loadtests/testConfig.sh
index 59f64e1..fc4de12 100755
--- a/stack/loadtests/testConfig.sh
+++ b/stack/loadtests/testConfig.sh
@@ -40,11 +40,11 @@ SKIP_SETUP=false
 COLLECTION=thousands
 ENTITY_TYPE=trivialSortable
 ENTITY_PREFIX=sortable
-ENTITY_SEED=1
+ENTITY_SEED=0
 
 SEARCH_QUERY=order%20by%20sortField%20desc
 SEARCH_LIMIT=1000
-RETRY_COUNT=5
+RETRY_COUNT=0
 LATER_THAN_TIMESTAMP=0
 ENTITY_PROGRESS_COUNT=1000
 


Mime
View raw message