[Hawkular-commits] [hawkular/hawkular-metrics] 316b7c: [HWKMETRIC-207] clean up MetricsServiceImpl.create...

Branch: refs/heads/implicit-tenants Home: https://github.com/hawkular/hawkular-metrics Commit: 316b7cc210f91c10278a547343f248ceb9382205 https://github.com/hawkular/hawkular-metrics/commit/316b7cc210f91c10278a5... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java Log Message: ----------- [HWKMETRIC-207] clean up MetricsServiceImpl.createTenant method Commit: dbf8a7ce6c23ce6a20f8a7f44cf2768b0f30e044 https://github.com/hawkular/hawkular-metrics/commit/dbf8a7ce6c23ce6a20f8a... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GenerateRate.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/GenerateRateITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/RatesITest.java Log Message: ----------- [HWKMETRICS-200] initial support for calculating rates per tenant Commit: bf12bc1e161b809daceff3845f07207e1bd07a08 https://github.com/hawkular/hawkular-metrics/commit/bf12bc1e161b809daceff... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java Log Message: ----------- [HWKMETRICS-200] fix merge conflicts Commit: 3ac18b67eea4959453855a28c80e98802a6f82df https://github.com/hawkular/hawkular-metrics/commit/3ac18b67eea4959453855... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GenerateRate.java Log Message: ----------- [HWKMETRICS-200] add some comments Commit: b4ed63c0541b1f68dacafe6715f0faaf8a151547 https://github.com/hawkular/hawkular-metrics/commit/b4ed63c0541b1f68dacaf... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/CreateTenants.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccess.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java A core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/CreateTenantsITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DelegatingDataAccess.java M schema-manager/src/main/resources/schema.cql Log Message: ----------- [HWKMETRICS-204] initial commit for task to create tenants We query the metrics_idx table to determine whether or not a metric exists. Metrics are implicitly created when inserting data points because we write to both the data and the metrics_idx tables. We need to implicitly create tenants in order to set up various background jobs like generating rates and deleting data (see HWKMETRICS-191 for details). Commit: c038cfdf561c4c8451a3d98f6bccac476d57f18f https://github.com/hawkular/hawkular-metrics/commit/c038cfdf561c4c8451a3d... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/CreateTenants.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccess.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TenantsService.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/CreateTenantsITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DelegatingDataAccess.java M schema-manager/src/main/resources/schema.cql Log Message: ----------- [HWKMETRICS-204] fix schema and implicit tenant creation logic The tenant column in tenants_by_time needs to be a clustering column. CreateTenants has been updated to properly filter out id of tenants that already exist. A new tenant creation method in MetricsServiceImpl is used. It does not use a light weight transaction, nor does it update the retentions index. There is no reason to incur the overhead of a LWT because its use is intended for explicit tenant creation to ensure there is no naming conflict. Commit: 3bc758322f48e4289207492919c42f81eaaf4ffb https://github.com/hawkular/hawkular-metrics/commit/3bc758322f48e42892074... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/CreateTenants.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GenerateRate.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java A core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsInitializationITest.java Log Message: ----------- [HWKMETRICS-204] perform system initialization at start up In MetricsServiceImpl.startUp(), we now initializae some state that is shared across all h-metrics instances. We create an internal, system tenant and schedule the tenant creation job. Commit: 4bc66034aef25d3d195805a699a04cbddae1ccd8 https://github.com/hawkular/hawkular-metrics/commit/4bc66034aef25d3d19580... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java Log Message: ----------- [HWKMETRICS-204] fix typo Commit: 35c7cb4d9ae4920c12f4dd07a077c86cd3de4c19 https://github.com/hawkular/hawkular-metrics/commit/35c7cb4d9ae4920c12f4d... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/CreateTenants.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java A core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/CreateTenantsSchedulerITest.java Log Message: ----------- [HWKMETRICS] add test for tenant creation job with scheduler running Commit: 99c267ce0bc2852069dd370610b9e537faf679e8 https://github.com/hawkular/hawkular-metrics/commit/99c267ce0bc2852069dd3... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/CreateTenantsITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/CreateTenantsSchedulerITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/GenerateRateITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsInitializationITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/RatesITest.java M task-queue/src/main/java/org/hawkular/metrics/tasks/api/TaskScheduler.java M task-queue/src/main/java/org/hawkular/metrics/tasks/impl/TaskSchedulerImpl.java Log Message: ----------- [HWKMETRICS-204] initial core services and jobs For now MetricsServiceLifecycle is managing all of the core services and jobs. These include MetricsService, TaskScheduler, and the GenerateRate and CreateTenants jobs. Commit: a45dcc47c542103d89af78b239d102ea77edb1ed https://github.com/hawkular/hawkular-metrics/commit/a45dcc47c542103d89af7... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/FakeTaskScheduler.java Log Message: ----------- [HWKMETRICS-204] fix compile error Commit: 8dff085628a4ec63210bd576c586de631a73bd92 https://github.com/hawkular/hawkular-metrics/commit/8dff085628a4ec63210bd... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/CreateTenants.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/CreateTenantsITest.java Log Message: ----------- [HWKMETRICS-204] compute bucket start time correctly Commit: 0529b1d44399b67426d00b5f1289a863374bf784 https://github.com/hawkular/hawkular-metrics/commit/0529b1d44399b67426d00... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/CreateTenants.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DateTimeService.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CountersITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/RESTTest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/TenantITest.groovy M task-queue/src/main/java/org/hawkular/metrics/tasks/api/AbstractTrigger.java M task-queue/src/main/java/org/hawkular/metrics/tasks/api/RepeatingTrigger.java Log Message: ----------- [HWKMETRICS-204] update tenants_by_time when inserting data, add REST API test We now update the tenants_by_time table when inserting gauge data points. There is also a REST API test to verify that the tenant is created when we only insert gauge data points without explicitly creating the tenant. I will add logic/tests for availability and counters in subsequent commits. MetricsServiceLifecycle has also been updated to initialize scheduled jobs, which now include the GenerateRate and CreateTenants classes. I do not like having the job initialization logic, particularly the part of subscribing the jobs, in MetricsServiceLifecyle. It should be a separate, core concern IMO. This will probably be refactored in the near future once we see how the scheduled jobs takes shape. Commit: 9697f106912dcfb1b2f2d6fdb70b789e30f50c2e https://github.com/hawkular/hawkular-metrics/commit/9697f106912dcfb1b2f2d... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/CreateTenantsITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/CreateTenantsSchedulerITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java Log Message: ----------- [HWKMETRICS-204] updating tenant buckets when inserting counter and avail data This commit also adds tests to verify that the tenants_by_time table is updated when inserting data points for each of the metric types. Commit: cb9fe8d82e152759a0462d22e6a72b27538fd987 https://github.com/hawkular/hawkular-metrics/commit/cb9fe8d82e152759a0462... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/VirtualClockHandler.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/GenerateRateITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/RatesITest.java M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CountersITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/TenantITest.groovy Log Message: ----------- [HWKMETRICS-204] adding and updating tests Adding REST API tests to verify tenants are created after inserting counter and availability data points. There are some changes and fixes with the virtual clock stuff. MetricsServiceLifecycle now starts the task scheduler even when a virtual clock is being used. The /hawkular/metrics/clock/wait endpoint now advances the clock and then blocks for the specified duration. Lastly, this commit fixes the set up in some of the core/impl tests. DateTimeService now has to be injected into MetricsServiceImpl. Commit: c714f8482cc780664120670daea7b862de8349b9 https://github.com/hawkular/hawkular-metrics/commit/c714f8482cc7806641206... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/VirtualClockHandler.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CountersITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/TenantITest.groovy Log Message: ----------- [HWKMETRICS-204] fixing merge conflicts and porting code to JAX-RS 1.1 impl Compare: https://github.com/hawkular/hawkular-metrics/compare/67a373346b0c...c714f...