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 2015/08/03 22:31:04 UTC
[20/21] incubator-usergrid git commit: USERGRID-871: synchronize the
uuid Map
USERGRID-871: synchronize the uuid Map
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b038b46f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b038b46f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b038b46f
Branch: refs/heads/two-dot-o-dev
Commit: b038b46f92dfc30f621d773063dac662ba14a67f
Parents: d6368af
Author: Mike Dunker <md...@apigee.com>
Authored: Mon Aug 3 12:27:59 2015 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Mon Aug 3 12:27:59 2015 -0700
----------------------------------------------------------------------
stack/loadtests/runAuditGetCollectionEntities.sh | 5 +++--
.../src/main/scala/org/apache/usergrid/settings/Settings.scala | 6 +++++-
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b038b46f/stack/loadtests/runAuditGetCollectionEntities.sh
----------------------------------------------------------------------
diff --git a/stack/loadtests/runAuditGetCollectionEntities.sh b/stack/loadtests/runAuditGetCollectionEntities.sh
index 673c2b7..b79b609 100755
--- a/stack/loadtests/runAuditGetCollectionEntities.sh
+++ b/stack/loadtests/runAuditGetCollectionEntities.sh
@@ -38,8 +38,9 @@ ADMIN_PASSWORD=test
ORG=gatling
APP=millionentities
SCENARIO_TYPE=auditGetCollectionEntities
-SEARCH_LIMIT=177
-SEARCH_QUERY=order%20by%20name
+SEARCH_LIMIT=1000
+#SEARCH_QUERY=order%20by%20name
+SEARCH_QUERY=
AUTH_TYPE=token
TOKEN_TYPE=management
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b038b46f/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 663d4d6..0714698 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
@@ -230,7 +230,11 @@ object Settings {
private var uuidMap: Map[Int, String] = Map()
def addUuid(num: Int, uuid: String): Unit = {
- if (captureUuids) uuidMap += (num -> uuid)
+ if (captureUuids) {
+ uuidMap.synchronized {
+ uuidMap += (num -> uuid)
+ }
+ }
// println(s"UUID: ${name},${uuid}")
}