Merge pull request #235 from ExpediaDotCom/cassandra-resiliency

 fixing unit tests

Author: Magesh Chandramouli

backends/cassandra/build/integration-tests/docker-app.conf

@@ -93,7 +93,11 @@
                             <goal>test</goal>
                         </goals>
                         <configuration>
-                            <wildcardSuites>com.expedia.www.haystack.trace.reader.unit</wildcardSuites>
+                            <environmentVariables>
+                                <HAYSTACK_PROP_CASSANDRA_ENDPOINTS>cass1,cass2</HAYSTACK_PROP_CASSANDRA_ENDPOINTS>
+                                <HAYSTACK_PROP_CASSANDRA_KEYSPACE_AUTO_CREATE_SCHEMA>cassandra_cql_schema_1</HAYSTACK_PROP_CASSANDRA_KEYSPACE_AUTO_CREATE_SCHEMA>
+                            </environmentVariables>
+                            <wildcardSuites>com.expedia.www.haystack.trace.storage.backends.cassandra.unit</wildcardSuites>
                         </configuration>
                     </execution>
                     <execution>
@@ -104,10 +108,9 @@
                         </goals>
                         <configuration>
                             <environmentVariables>
-                                <HAYSTACK_OVERRIDES_CONFIG_PATH>/src/reader/build/integration-tests/docker-app.conf
-                                </HAYSTACK_OVERRIDES_CONFIG_PATH>
+                                <HAYSTACK_OVERRIDES_CONFIG_PATH>/src/backends/cassandra/build/integration-tests/docker-app.conf</HAYSTACK_OVERRIDES_CONFIG_PATH>
                             </environmentVariables>
-                            <wildcardSuites>com.expedia.www.haystack.trace.reader.integration</wildcardSuites>
+                            <wildcardSuites>com.expedia.www.haystack.trace.storage.backends.cassandra.integration</wildcardSuites>
                         </configuration>
                     </execution>
                 </executions>

backends/cassandra/pom.xml

@@ -1,12 +1,12 @@
 haystack.graphite.host = "monitoring-influxdb-graphite.kube-system.svc"
 
 service {
-    port = 8090
-    ssl {
-      enabled = false
-      cert.path = ""
-      private.key.path = ""
-    }
+  port = 8090
+  ssl {
+    enabled = false
+    cert.path = "/ssl/cert"
+    private.key.path = "/ssl/private-key"
+  }
 }
 
 cassandra {
@@ -26,14 +26,26 @@ cassandra {
   }
 
   connections {
-    max.per.host = 10
+    max.per.host = 100
     read.timeout.ms = 5000
     conn.timeout.ms = 10000
     keep.alive = true
   }
+  ttl.sec = 86400
+
+  retries {
+    max = 10
+    backoff {
+      initial.ms = 250
+      factor = 2
+    }
+  }
 
   keyspace {
     name = "haystack"
     table.name = "traces"
+    auto.create.schema = "CREATE KEYSPACE IF NOT EXISTS haystack WITH REPLICATION = { 'class': 'SimpleStrategy', 'replication_factor' : 1 } AND durable_writes = false; CREATE TABLE IF NOT EXISTS haystack.traces (id varchar, ts timestamp, spans blob, PRIMARY KEY ((id), ts)) WITH CLUSTERING ORDER BY (ts ASC) AND compaction = { 'class' :  'DateTieredCompactionStrategy', 'max_sstable_age_days': '3' } AND gc_grace_seconds = 86400;"
+
+
   }
 }

backends/cassandra/src/test/resources/config/base.conf

@@ -47,22 +47,19 @@ trait BaseIntegrationTestSpec extends FunSpec with GivenWhenThen with Matchers w
   private var cassandraSession: Session = _
 
   override def beforeAll() {
+    executors.submit(new Runnable {
+      override def run(): Unit = Service.main(null)
+    })
+    //waiting for the service to start up
+
+    Thread.sleep(5000)
     // setup cassandra
     cassandraSession = Cluster
       .builder()
       .addContactPoints(CASSANDRA_ENDPOINT)
       .build()
       .connect(CASSANDRA_KEYSPACE)
     deleteCassandraTableRows()
-
-
-
-    executors.submit(new Runnable {
-      override def run(): Unit = Service.main(null)
-    })
-
-    Thread.sleep(5000)
-
     client = StorageBackendGrpc.newBlockingStub(ManagedChannelBuilder.forAddress("localhost", 8090)
       .usePlaintext(true)
       .build())

backends/cassandra/src/test/scala/com/expedia/www/haystack/trace/storage/backends/cassandra/integration/BaseIntegrationTestSpec.scala

@@ -27,7 +27,7 @@ class ConfigurationLoaderSpec extends BaseUnitTestSpec {
     it("should load the service config from base.conf") {
       val serviceConfig: ServiceConfiguration = project.serviceConfig
       serviceConfig.port shouldBe 8090
-      serviceConfig.ssl.enabled shouldBe true
+      serviceConfig.ssl.enabled shouldBe false
       serviceConfig.ssl.certChainFilePath shouldBe "/ssl/cert"
       serviceConfig.ssl.privateKeyPath shouldBe "/ssl/private-key"
     }