[HWKMETRICS-52] Make sure schema is installed when building task-queu…

…e module

core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/MetricsServiceCassandra.java

@@ -97,8 +97,6 @@ public class MetricsServiceCassandra implements MetricsService {
 
     public static final int DEFAULT_TTL = Duration.standardDays(7).toStandardSeconds().getSeconds();
 
-    private static final String SCHEMA_FILE = "/schema.cql";
-
     private static class DataRetentionKey {
         private final String tenantId;
         private final MetricId metricId;
@@ -205,7 +203,7 @@ public void startUp(Map<String, String> params) {
 
         if (keyspace==null||keyspace.isEmpty()) {
             logger.debug("No explicit keyspace given, will default to 'hawkular'");
-            keyspace = "hawkular-metrics";
+            keyspace = "hawkular_metrics";
         }
 
         logger.info("Using a key space of '" + keyspace + "'");
@@ -801,7 +799,7 @@ private int getTTL(Metric<?> metric) {
     private void updateSchemaIfNecessary(String schemaName) {
         try {
             SchemaManager schemaManager = new SchemaManager(session.get());
-            schemaManager.createSchema(schemaName, SCHEMA_FILE);
+            schemaManager.createSchema(schemaName);
         } catch (IOException e) {
             throw new RuntimeException("Schema creation failed", e);
         }

core/metrics-core-impl/src/main/script/schema.groovy

@@ -27,4 +27,4 @@ Session session = cluster.connect()
 String keyspace = properties["keyspace"] ?: "hawkulartest"
 SchemaManager schemaManager = new SchemaManager(session)
 if (properties["resetdb"]) schemaManager.dropKeyspace(keyspace)
-schemaManager.createSchema(keyspace, "/schema.cql")
+schemaManager.createSchema(keyspace)

schema-manager/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.hawkular.metrics</groupId>
     <artifactId>hawkular-metrics-parent</artifactId>
-    <version>0.3.4-SNAPSHOT</version>
+    <version>0.3.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

schema-manager/src/main/java/org/hawkular/metrics/schema/SchemaManager.java

@@ -49,7 +49,7 @@ public void dropKeyspace(String keyspace) {
         session.execute("DROP KEYSPACE " + keyspace);
     }
 
-    public void createSchema(String keyspace, String cqlFile) throws IOException {
+    public void createSchema(String keyspace) throws IOException {
         logger.info("Creating schema for keyspace " + keyspace);
 
         ResultSet resultSet = session.execute("SELECT * FROM system.schema_keyspaces WHERE keyspace_name = '" +
@@ -61,7 +61,7 @@ public void createSchema(String keyspace, String cqlFile) throws IOException {
 
         ImmutableMap<String, String> schemaVars = ImmutableMap.of("keyspace", keyspace);
 
-        try (InputStream inputStream = getClass().getResourceAsStream(cqlFile);
+        try (InputStream inputStream = getClass().getResourceAsStream("/schema.cql");
             InputStreamReader reader = new InputStreamReader(inputStream)) {
             String content = CharStreams.toString(reader);
 

task-queue/pom.xml

@@ -31,7 +31,17 @@
   <artifactId>hawkular-metrics-task-queue</artifactId>
   <name>Hawkular Metrics Task Queue</name>
 
+  <properties>
+    <test.keyspace>hawkulartest</test.keyspace>
+  </properties>
+
   <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>schema-manager</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>com.datastax.cassandra</groupId>
       <artifactId>cassandra-driver-core</artifactId>
@@ -62,4 +72,18 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <keyspace>${test.keyspace}</keyspace>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

task-queue/src/main/java/org/hawkular/metrics/tasks/impl/TaskServiceImpl.java

@@ -22,6 +22,7 @@
 import static org.joda.time.Duration.standardMinutes;
 import static org.joda.time.Duration.standardSeconds;
 
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -50,6 +51,7 @@
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Uninterruptibles;
+import org.hawkular.metrics.schema.SchemaManager;
 import org.hawkular.metrics.tasks.DateTimeService;
 import org.hawkular.metrics.tasks.api.Task;
 import org.hawkular.metrics.tasks.api.TaskExecutionException;
@@ -112,16 +114,22 @@ public class TaskServiceImpl implements TaskService {
     private TimeUnit timeUnit = TimeUnit.MINUTES;
 
     public TaskServiceImpl(Session session, Queries queries, LeaseService leaseService, List<TaskType> taskTypes) {
-        this.session = session;
-        this.queries = queries;
-        this.leaseService = leaseService;
-        this.taskTypes = taskTypes;
         try {
+            this.session = session;
+            this.queries = queries;
+            this.leaseService = leaseService;
+            this.taskTypes = taskTypes;
+            dateTimeService = new DateTimeService();
             owner = InetAddress.getLocalHost().getHostName();
+
+            SchemaManager schemaManager = new SchemaManager(session);
+            String keyspace = System.getProperty("keyspace", "hawkular_metrics");
+            schemaManager.createSchema(keyspace);
         } catch (UnknownHostException e) {
             throw new RuntimeException("Failed to initialize owner name", e);
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to initialize schema", e);
         }
-        dateTimeService = new DateTimeService();
     }
 
     /**

task-queue/src/test/java/org/hawkular/metrics/tasks/BaseTest.java

@@ -24,6 +24,7 @@
 import com.datastax.driver.core.Session;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.Uninterruptibles;
+import org.hawkular.metrics.schema.SchemaManager;
 import org.hawkular.metrics.tasks.impl.Queries;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeSuite;
@@ -42,9 +43,16 @@ public class BaseTest {
     protected static Queries queries;
 
     @BeforeSuite
-    public static void initSuite() {
+    public static void initSuite() throws Exception {
         Cluster cluster = Cluster.builder().addContactPoints("127.0.0.01").build();
-        session = cluster.connect(System.getProperty("keyspace", "hawkulartest"));
+        String keyspace = System.getProperty("keyspace", "hawkulartest");
+        session = cluster.connect("system");
+
+        SchemaManager schemaManager = new SchemaManager(session);
+        schemaManager.createSchema(keyspace);
+
+        session.execute("USE " + keyspace);
+
         queries = new Queries(session);
         dateTimeService = new DateTimeService();
     }