[Hawkular-commits] [hawkular/hawkular-metrics] 5bcb47: initial integration of cassalog

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-metrics Commit: 5bcb4706a3eadc9a6132751eb430886a1dbeee4a https://github.com/hawkular/hawkular-metrics/commit/5bcb4706a3eadc9a61327... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2016-03-28 (Mon, 28 Mar 2016) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java M core/metrics-core-service/pom.xml M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsServiceImpl.java A core/metrics-core-service/src/main/resources/cassalog.groovy R core/metrics-core-service/src/main/script/schema.groovy M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/DataAccessITest.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/GenerateRateITest.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/MetricsITest.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/MetricsServiceITest.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/RatesITest.java M core/metrics-core-service/src/test/resources/logback-test.xml R core/schema-manager/pom.xml R core/schema-manager/src/main/java/org/hawkular/metrics/schema/SchemaManager.java R core/schema-manager/src/main/java/org/hawkular/metrics/schema/TokenReplacingReader.java R core/schema-manager/src/main/java/org/hawkular/metrics/schema/log/SchemaManagerLogger.java R core/schema-manager/src/main/java/org/hawkular/metrics/schema/log/SchemaManagerLogging.java R core/schema-manager/src/main/resources/schema.cql A core/schema/pom.xml A core/schema/src/main/java/org/hawkular/metrics/schema/SchemaService.java A core/schema/src/main/resources/cassalog.groovy M core/task-queue/pom.xml M core/task-queue/src/test/java/org/hawkular/metrics/tasks/BaseITest.java M pom.xml Log Message: ----------- initial integration of cassalog This commit removes the schema-manager module and replaces it with the schema module which encapsulates cassalog. Schema changes reside in a groovy script named cassalog.groovy. Commit: 9d566e86057b4dd4f8d2b707a9818d6b16a2e8a4 https://github.com/hawkular/hawkular-metrics/commit/9d566e86057b4dd4f8d2b... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2016-03-28 (Mon, 28 Mar 2016) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java R core/metrics-core-service/src/main/resources/cassalog.groovy M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/MetricsITest.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/MetricsServiceITest.java M core/schema/src/main/java/org/hawkular/metrics/schema/SchemaService.java M core/schema/src/main/resources/cassalog.groovy M pom.xml Log Message: ----------- [HWKMETRICS-361] add logic for version 0.8.0 of hawkular metrics Hawkular Metrics 0.8.0 shipped in OpenShift 3.1 which means we need logic to handle users upgrading from 0.8.0. We need to keep those schemas intacts. For other versions, we can require a fresh install with a new schema for the initial version that includes cassalog support. Commit: da3a217bfa6db9d81a7f22e5e079d20fe129ec84 https://github.com/hawkular/hawkular-metrics/commit/da3a217bfa6db9d81a7f2... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2016-03-28 (Mon, 28 Mar 2016) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java M core/schema/src/main/resources/cassalog.groovy M integration-tests/hawkular-server-tests/pom.xml M pom.xml Log Message: ----------- [HWKMETRICS-361] clean up merge conflicts after rebase Commit: f2a46accac69c63da1b378c9cbd7748f1a0c0788 https://github.com/hawkular/hawkular-metrics/commit/f2a46accac69c63da1b37... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2016-03-28 (Mon, 28 Mar 2016) Changed paths: M core/schema/src/main/java/org/hawkular/metrics/schema/SchemaService.java A core/schema/src/main/resources/bootstrap.groovy M core/schema/src/main/resources/cassalog.groovy M integration-tests/hawkular-server-tests/pom.xml Log Message: ----------- [HWKMETRICS-361] add bootstrap script to properly initialize schema The previous code in cassalog.groovy that had some conditional logic based on the version of Hawkular Metrics had some holes in the logic. bootstrap.groovy has been added to handle new installs and upgrades. Any schema changes can then be placed in cassalog.groovy without having to worry about whether it is a new install or an upgrade. Commit: 98af199ac565c80a686396fcbacaeee4e442d55a https://github.com/hawkular/hawkular-metrics/commit/98af199ac565c80a68639... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2016-03-28 (Mon, 28 Mar 2016) Changed paths: M core/schema/src/main/java/org/hawkular/metrics/schema/SchemaService.java R core/schema/src/main/resources/bootstrap.groovy R core/schema/src/main/resources/cassalog.groovy A core/schema/src/main/resources/org/hawkular/schema/bootstrap.groovy A core/schema/src/main/resources/org/hawkular/schema/cassalog.groovy A core/schema/src/main/resources/org/hawkular/schema/updates/schema-0.14.0.groovy Log Message: ----------- [HWKMETRICS-361, HWKMETRICS-367] fix bootstrap log, reduce gc_grace_seconds Commit: fda0b27dfea9c0ed5ff0de73baab087b21ea14b3 https://github.com/hawkular/hawkular-metrics/commit/fda0b27dfea9c0ed5ff0d... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2016-03-28 (Mon, 28 Mar 2016) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/MetricsITest.java M core/schema/src/main/java/org/hawkular/metrics/schema/SchemaService.java M core/schema/src/main/resources/org/hawkular/schema/cassalog.groovy R core/schema/src/main/resources/org/hawkular/schema/updates/schema-0.14.0.groovy A core/schema/src/main/resources/org/hawkular/schema/updates/schema-0.15.0.groovy M core/task-queue/src/test/java/org/hawkular/metrics/tasks/BaseITest.java M integration-tests/hawkular-server-tests/pom.xml Log Message: ----------- [HWKMETRICS-361] minor changes based on discussions on how to handle upgrades Commit: 05ff310915a5769c669ea10cfb844dd092d34400 https://github.com/hawkular/hawkular-metrics/commit/05ff310915a5769c669ea... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2016-03-28 (Mon, 28 Mar 2016) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java M core/metrics-core-service/pom.xml M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsServiceImpl.java R core/metrics-core-service/src/main/script/schema.groovy M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/DataAccessITest.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/GenerateRateITest.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/MetricsITest.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/MetricsServiceITest.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/RatesITest.java M core/metrics-core-service/src/test/resources/logback-test.xml R core/schema-manager/pom.xml R core/schema-manager/src/main/java/org/hawkular/metrics/schema/SchemaManager.java R core/schema-manager/src/main/java/org/hawkular/metrics/schema/TokenReplacingReader.java R core/schema-manager/src/main/java/org/hawkular/metrics/schema/log/SchemaManagerLogger.java R core/schema-manager/src/main/java/org/hawkular/metrics/schema/log/SchemaManagerLogging.java R core/schema-manager/src/main/resources/schema.cql A core/schema/pom.xml A core/schema/src/main/java/org/hawkular/metrics/schema/SchemaService.java A core/schema/src/main/resources/org/hawkular/schema/bootstrap.groovy A core/schema/src/main/resources/org/hawkular/schema/cassalog.groovy A core/schema/src/main/resources/org/hawkular/schema/updates/schema-0.15.0.groovy M core/task-queue/pom.xml M core/task-queue/src/test/java/org/hawkular/metrics/tasks/BaseITest.java M integration-tests/hawkular-server-tests/pom.xml M pom.xml Log Message: ----------- Merge pull request #468 from jsanda/cassalog [HWKMETRICS-361] schema change management support Compare: https://github.com/hawkular/hawkular-metrics/compare/9bb07f037d1c...05ff3...