Merge branch 'release-2.1.1' * release-2.1.1: (23 commits) Add more info to the log statement when we can't load an application. Update logging statements to be trace level. Clear an app's push manager queue cache when notifiers are added ( current notifiers are stored as a hash map within the class instance). Re-work caching of push notification queue managers such that producing and consuming leverage the same cache. Ensure the hector cluster is created with credentials from the properties file. Added fixes around caching and changed the endpoint to selective indexing to be /_index instead of /_indexes Tweak heap status to return used heap, and changed endpoint to status/heap. Add status/memory endpoint to get heap usage, max heap, and free heap. Increase limit of device fetching per user to 50. Increase AWS client timeouts. Back to Schedulers.io() Update distinct to properly use device ID. Update distinct code. Fix scheduler. Temporarily disable notification counters and back to Schedulers.io() Fix NPE. Added a test for counters that isn't correctly configured to work with other tests yet, and added the counters to the backend of notifications for further examination. Add a separate executor pool for async processing instead of unbounded Schedulers.io() Invalidate ShiroCache when admin user added to org. Ensure that applicationId cache does not cache nulls. ...
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e4beaead Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e4beaead Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e4beaead Branch: refs/heads/master Commit: e4beaead1026f280ea65b363c40f48e22be65a2b Parents: 279c020 f4c8a01 Author: George Reyes <g...@apache.org> Authored: Mon May 2 12:44:49 2016 -0700 Committer: George Reyes <g...@apache.org> Committed: Mon May 2 12:44:49 2016 -0700 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 10 +- .../corepersistence/ApplicationIdCacheImpl.java | 9 +- .../corepersistence/CpEntityManager.java | 4 +- .../index/IndexSchemaCacheFig.java | 2 +- .../index/IndexSchemaCacheImpl.java | 3 +- .../corepersistence/index/IndexServiceImpl.java | 1 + .../org/apache/usergrid/utils/StringUtils.java | 8 + .../main/resources/usergrid-core-context.xml | 6 + .../shard/impl/NodeShardAllocationImpl.java | 7 +- .../shard/impl/ShardGroupCompactionImpl.java | 18 +-- .../usergrid/persistence/queue/QueueFig.java | 4 +- .../queue/impl/QueueManagerFactoryImpl.java | 27 ++-- .../org/apache/usergrid/rest/RootResource.java | 25 +++ .../rest/applications/CollectionResource.java | 8 +- .../apache/usergrid/rest/NotificationsIT.java | 11 ++ .../collection/CollectionsResourceIT.java | 147 +++++++++++++++--- .../events/ApplicationRequestCounterIT.java | 48 ++++++ .../cassandra/ManagementServiceImpl.java | 93 ++++++------ .../ApplicationQueueManagerCache.java | 143 ++++++++++++++++++ .../notifications/NotificationsService.java | 11 +- .../services/notifications/QueueListener.java | 58 ++----- .../services/notifications/TaskManager.java | 117 +++++++------- .../impl/ApplicationQueueManagerImpl.java | 151 +++++++++++++------ .../services/notifiers/NotifiersService.java | 6 + .../gcm/NotificationsServiceIT.java | 77 ++++++++++ 25 files changed, 741 insertions(+), 253 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/e4beaead/stack/core/src/main/resources/usergrid-core-context.xml ----------------------------------------------------------------------