Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
* 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: Add database connection closing to shutdown listener and again tweak test properties. Remove reuse address. Add reconnection policy. Fix conversion to seconds. Update timeout configurations. Synchronize creation/connecting of datastax cluster and sessions. Additional test adjustments to better work with CI environments. Still tweaking tests for CI environments. Add more database connections for the tests ( single database host being used in CI jobs ). Increase database connection pools for persistence tests. Better tune connection pool with the datastax driver. Set core and max connections to be the same for the datastax driver. Reduce load on datastax control connection ( mostly for tests because the interact with the schema A LOT). Revert "Increase test cassandra connections per host as we test with only 1 host." Increase test cassandra connections per host as we test with only 1 host. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fbd73cd9 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fbd73cd9 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fbd73cd9 Branch: refs/heads/master Commit: fbd73cd910d8006f7cb8082478c898a914198734 Parents: d1ac184 bb5d3f5 Author: Dave Johnson <[email protected]> Authored: Mon Nov 14 12:45:40 2016 -0800 Committer: Dave Johnson <[email protected]> Committed: Mon Nov 14 12:45:40 2016 -0800 ---------------------------------------------------------------------- stack/core/src/test/resources/log4j.properties | 2 + .../resources/usergrid-custom-test.properties | 3 +- .../src/test/resources/dynamic-test.properties | 3 +- .../src/test/resources/usergrid-CHOP.properties | 3 +- .../src/test/resources/usergrid-UNIT.properties | 3 +- .../src/test/resources/usergrid.properties | 3 ++ .../core/datastax/DataStaxCluster.java | 2 + .../core/datastax/impl/DataStaxClusterImpl.java | 40 ++++++++++++++------ .../migration/schema/MigrationManagerImpl.java | 25 +++++++++++- .../src/test/resources/usergrid-UNIT.properties | 3 +- .../src/test/resources/usergrid-AWS.properties | 3 +- .../src/test/resources/usergrid-CHOP.properties | 3 +- .../src/test/resources/usergrid-UNIT.properties | 3 +- .../src/test/resources/usergrid.properties | 3 ++ stack/corepersistence/pom.xml | 2 +- .../src/test/resources/dynamic-test.properties | 3 +- .../src/test/resources/usergrid-CHOP.properties | 3 +- .../src/test/resources/usergrid-UNIT.properties | 3 +- .../qakka/core/CassandraClientImpl.java | 8 ++-- .../qakka/core/QueueMessageManagerTest.java | 6 +++ .../distributed/actors/ShardAllocatorTest.java | 4 +- .../queue/src/test/resources/log4j.properties | 9 +++-- .../queue/src/test/resources/qakka.properties | 5 ++- .../apache/usergrid/rest/ShutdownListener.java | 6 +++ .../resources/usergrid-custom-test.properties | 3 +- .../resources/usergrid-custom-test.properties | 3 +- 26 files changed, 116 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
