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/31 22:28:50 UTC
[1/6] usergrid git commit: Add delay to stale index cleanup on
deletes.
Repository: usergrid
Updated Branches:
refs/heads/two-dot-o-dev d626f8cb7 -> 5c46fde89
Add delay to stale index cleanup on deletes.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/982bfd90
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/982bfd90
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/982bfd90
Branch: refs/heads/two-dot-o-dev
Commit: 982bfd9075c6ae2eb6f6a22dea1aa1ea152e4b9e
Parents: 912c78e
Author: Michael Russo <mi...@gmail.com>
Authored: Fri Aug 28 13:48:57 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Fri Aug 28 13:48:57 2015 -0700
----------------------------------------------------------------------
.../corepersistence/StaleIndexCleanupTest.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/982bfd90/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
index 58406b4..832409b 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java
@@ -363,28 +363,29 @@ public class StaleIndexCleanupTest extends AbstractCoreIT {
// query Core Persistence directly for total number of result candidates
crs = queryCollectionCp("things", "thing", "select *");
- Assert.assertEquals( "Expect stale candidates", numEntities * (numUpdates + 1), crs.size());
+ Assert.assertEquals("Expect stale candidates", numEntities * (numUpdates + 1), crs.size());
// turn ON post processing stuff that cleans up stale entities
- System.setProperty( EVENTS_DISABLED, "false" );
+ System.setProperty(EVENTS_DISABLED, "false");
// delete all entities
for ( Entity thing : things ) {
em.delete( thing );
}
+ Thread.sleep(250); // delete happens asynchronously, wait for some time
- //put this into the top of the queue, once it's acked we've been flushed
+ //refresh the app index
app.refreshIndex();
- // wait for indexes to be cleared for the deleted entities
- count = 0;
-
+ Thread.sleep(250); // refresh happens asynchronously, wait for some time
+
//we can't use our candidate result sets here. The repair won't happen since we now have orphaned documents in our index
//us the EM so the repair process happens
Results results = null;
+ count = 0;
do {
//trigger the repair
results = queryCollectionEm("things", "select *");
[4/6] usergrid git commit: Merge commit 'refs/pull/364/head' of
github.com:apache/usergrid into two-dot-o-dev
Posted by to...@apache.org.
Merge commit 'refs/pull/364/head' of github.com:apache/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/75d3b04e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/75d3b04e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/75d3b04e
Branch: refs/heads/two-dot-o-dev
Commit: 75d3b04e9fb56959dac31f5b1e116a0452cf3009
Parents: d626f8c 982bfd9
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Aug 31 14:28:29 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Aug 31 14:28:29 2015 -0600
----------------------------------------------------------------------
.../corepersistence/StaleIndexCleanupTest.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/6] usergrid git commit: Fix errors that show in console when
switching organizations that triggers a re-authentication. Also ensure
insecure banner check knows the app for checking roles.
Posted by to...@apache.org.
Fix errors that show in console when switching organizations that triggers a re-authentication. Also ensure insecure banner check knows the app for checking roles.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/55d825b7
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/55d825b7
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/55d825b7
Branch: refs/heads/two-dot-o-dev
Commit: 55d825b73e97657de796ea0d590dbc87b9315951
Parents: 061ba91
Author: Michael Russo <mi...@gmail.com>
Authored: Fri Aug 28 14:26:00 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Fri Aug 28 14:26:00 2015 -0700
----------------------------------------------------------------------
portal/js/global/page-controller.js | 3 +--
portal/js/global/ug-service.js | 2 +-
portal/js/login/login-controller.js | 5 +++++
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/55d825b7/portal/js/global/page-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/global/page-controller.js b/portal/js/global/page-controller.js
index 8108a34..1132eda 100644
--- a/portal/js/global/page-controller.js
+++ b/portal/js/global/page-controller.js
@@ -322,7 +322,6 @@ AppServices.Controllers.controller('PageCtrl',
$rootScope.$emit('loginSuccesful', user, organizations, applications);
$rootScope.$broadcast('checkAuthentication-success');
$scope.applyScope(function() {
- $scope.deferredLogin.resolve();
$location.path('/org-overview');
})
});
@@ -417,4 +416,4 @@ AppServices.Controllers.controller('PageCtrl',
}
});
}
-]);
\ No newline at end of file
+]);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/55d825b7/portal/js/global/ug-service.js
----------------------------------------------------------------------
diff --git a/portal/js/global/ug-service.js b/portal/js/global/ug-service.js
index 233015b..6a9a99f 100644
--- a/portal/js/global/ug-service.js
+++ b/portal/js/global/ug-service.js
@@ -144,7 +144,7 @@ AppServices.Services.factory('ug', function(configuration, $rootScope, utility,
$rootScope.applications = applications;
$rootScope.currentOrg = ug.get('orgName');
$rootScope.currentApp = ug.get('appName');
- $rootScope.currentUser = user._data;
+ $rootScope.currentUser = data;
$rootScope.currentUser.profileImg = utility.get_gravatar(
$rootScope.currentUser.email);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/55d825b7/portal/js/login/login-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/login/login-controller.js b/portal/js/login/login-controller.js
index a20355e..25683bf 100755
--- a/portal/js/login/login-controller.js
+++ b/portal/js/login/login-controller.js
@@ -89,6 +89,11 @@ AppServices.Controllers.controller('LoginCtrl', ['ug', '$scope', '$rootScope', '
$scope.loading = false;
$scope.login = {};
+ // get the first app from logged in user and set this prop in the app for any initial app specific requests
+ var firstOrg = Object.keys($rootScope.currentUser.organizations)[0];
+ var firstApp = Object.keys($rootScope.currentUser.organizations[firstOrg].applications)[0];
+ ug.setClientProperty('appName', firstApp.split("/")[1]);
+
//if on login page, send to org overview page. if on a different page, let them stay there
if ($rootScope.currentPath === '/login' || $rootScope.currentPath === '/login/loading' || typeof $rootScope.currentPath === 'undefined') {
$location.path('/org-overview');
[5/6] usergrid git commit: Merge commit 'refs/pull/365/head' of
github.com:apache/usergrid into two-dot-o-dev
Posted by to...@apache.org.
Merge commit 'refs/pull/365/head' of github.com:apache/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6429323a
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6429323a
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6429323a
Branch: refs/heads/two-dot-o-dev
Commit: 6429323aba1e7c77fa4d8c1dd7c9749eedabc32f
Parents: 75d3b04 55d825b
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Aug 31 14:28:38 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Aug 31 14:28:38 2015 -0600
----------------------------------------------------------------------
portal/js/global/page-controller.js | 3 +--
portal/js/global/ug-service.js | 2 +-
portal/js/login/login-controller.js | 5 +++++
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[6/6] usergrid git commit: Merge commit 'refs/pull/366/head' of
github.com:apache/usergrid into two-dot-o-dev
Posted by to...@apache.org.
Merge commit 'refs/pull/366/head' of github.com:apache/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/5c46fde8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5c46fde8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5c46fde8
Branch: refs/heads/two-dot-o-dev
Commit: 5c46fde894159713e2b7541898657757b1ee2e29
Parents: 6429323 0e8d24e
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Aug 31 14:28:44 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Aug 31 14:28:44 2015 -0600
----------------------------------------------------------------------
stack/awscluster/gatling-cluster-cf.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/6] usergrid git commit: Update gatling cloud formation to reflect
github repo name change.
Posted by to...@apache.org.
Update gatling cloud formation to reflect github repo name change.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0e8d24eb
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0e8d24eb
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0e8d24eb
Branch: refs/heads/two-dot-o-dev
Commit: 0e8d24eb73c19e244015b1bd00a1b8084c7ef315
Parents: 061ba91
Author: Michael Russo <mi...@gmail.com>
Authored: Fri Aug 28 15:27:41 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Fri Aug 28 15:27:41 2015 -0700
----------------------------------------------------------------------
stack/awscluster/gatling-cluster-cf.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0e8d24eb/stack/awscluster/gatling-cluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/gatling-cluster-cf.json b/stack/awscluster/gatling-cluster-cf.json
index fadb4fc..4cc4ab0 100644
--- a/stack/awscluster/gatling-cluster-cf.json
+++ b/stack/awscluster/gatling-cluster-cf.json
@@ -261,7 +261,7 @@
"update-java-alternatives -s java-8-oracle\n",
"cd ~ubuntu\n",
- "git clone -b ",{ "Ref":"Branch" } , " https://github.com/apache/incubator-usergrid.git usergrid\n",
+ "git clone -b ",{ "Ref":"Branch" } , " https://github.com/apache/usergrid.git usergrid\n",
"chown -R ubuntu:ubuntu usergrid\n",
"ec2-create-tags $(curl -k http://169.254.169.254/latest/meta-data/instance-id) --region ", { "Ref" : "AWS::Region" }," --aws-access-key ",{ "Ref":"GatlingKey" }, " --aws-secret-key ", { "Fn::GetAtt":[ "GatlingKey", "SecretAccessKey" ] } ," --tag Name=", { "Ref":"AWS::StackName" }, "\n",