Lap resurrection (#270)

* lap resurection
* Print exceptions in the status logs

cloud/infrastructure/docker-elk/elk-down.sh

@@ -3,6 +3,6 @@ set -e
 
 cd build/docker-elk
 
-docker-compose down
+docker compose down
 docker image rm docker-elk_kibana
 docker image rm docker-elk_elasticsearch

cloud/infrastructure/docker-elk/elk-up.sh

@@ -3,4 +3,4 @@ set -e
 
 cd build/docker-elk
 
-docker-compose up -d
+docker compose up -d

cloud/infrastructure/docker-elk/init.sh

@@ -1,12 +1,18 @@
 #!/usr/bin/env bash
 
+set -ex
+
 #download docker-elk repo into a build directory
 rm -rf build/docker-elk/
 
 git clone https://github.com/deviantony/docker-elk.git build/docker-elk
 
+cd build/docker-elk
+git checkout 1bee7e1c097d3c2f9d72995d5ca2d6051f29381b
+cd ../../
+
 # do not delete elastic volume
-#docker volume rm docker-elk_elasticsearch
+docker volume rm docker-elk_elasticsearch || true
 
 #copy configs into a build dir
 cp -v docker-compose.yml build/docker-elk

cloud/infrastructure/docker-elk/kibana/config/kibana.yml

@@ -4,10 +4,8 @@
 #
 server.name: kibana
 server.host: "0"
-elasticsearch.hosts: [ "http://elasticsearch:9200" ]
-xpack.monitoring.ui.container.elasticsearch.enabled: false
+elasticsearch.hosts: [ "http://10.173.65.105:9200" ]
+#monitoring.ui.container.elasticsearch.enabled: false
 
-## X-Pack security credentials
-#
 elasticsearch.username: elastic
 elasticsearch.password: changeme

cloud/infrastructure/filebeat/filebeat/Dockerfile

@@ -1,5 +1,11 @@
 FROM docker.elastic.co/beats/filebeat:7.10.0
 
+USER root
+
+RUN yum install -y yum-utils \
+    && yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
+    && yum install -y docker-ce-cli
+
 ADD filebeat.yml /usr/share/filebeat/filebeat.yml
 
 CMD filebeat -e --strict.perms=false --once run

cloud/infrastructure/integration-tools/Dockerfile

@@ -1,4 +1,16 @@
-FROM openjdk
+FROM openjdk:21-bullseye
+
+RUN apt update \
+    && apt install -y ca-certificates curl \
+    && install -m 0755 -d /etc/apt/keyrings \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
+    && chmod a+r /etc/apt/keyrings/docker.asc \
+    && echo \
+         "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+         $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+        tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+RUN apt update && apt install -y docker-ce-cli
 
 ADD ./lib /app/lib/
 ADD ./*.jar /app/

cloud/infrastructure/integration-tools/src/main/kotlin/org/corfudb/cloud/infrastructure/integration/extractor/DownloadCommand.kt

@@ -18,7 +18,7 @@ import java.nio.channels.FileChannel
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.StandardOpenOption
-import java.util.*
+import java.util.EnumSet
 
 class DownloadCommand : CliktCommand(name = "download") {
     private val aggregationUnit: String by argument(help = "In this case An aggregation unit is an equivalent " +

cloud/infrastructure/integration-tools/src/main/kotlin/org/corfudb/cloud/infrastructure/integration/kv/kvstore.kt

@@ -1,7 +1,12 @@
 package org.corfudb.cloud.infrastructure.integration.kv
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import org.rocksdb.*
+import org.rocksdb.ColumnFamilyDescriptor
+import org.rocksdb.ColumnFamilyHandle
+import org.rocksdb.DBOptions
+import org.rocksdb.Options
+import org.rocksdb.RocksDB
+import org.rocksdb.WriteOptions
 import java.time.Instant
 import java.time.format.DateTimeFormatter
 
@@ -23,9 +28,9 @@ object RocksDbManager {
 }
 
 class RocksDbProvider(
-        private val config: RocksDbConfig,
-        val db: RocksDB,
-        private val cfHandles: MutableList<ColumnFamilyHandle>
+    private val config: RocksDbConfig,
+    val db: RocksDB,
+    private val cfHandles: MutableList<ColumnFamilyHandle>
 ) {
 
     fun findColumnFamily(name: String): ColumnFamilyHandle? {
@@ -45,15 +50,15 @@ class RocksDbProvider(
 }
 
 class RocksDbConfig(
-        val dbDir: String = "/data/processing.db",
-        val opts: Options = Options().setCreateIfMissing(true)
+    val dbDir: String = "/data/processing.db",
+    val opts: Options = Options().setCreateIfMissing(true)
 ) {
     val dbOpts = DBOptions(opts)
 
     fun listColumnFamilies(): List<ColumnFamilyDescriptor> {
         var columnFamilies = RocksDB
-                .listColumnFamilies(opts, dbDir)
-                .map { cf -> ColumnFamilyDescriptor(cf) }
+            .listColumnFamilies(opts, dbDir)
+            .map { cf -> ColumnFamilyDescriptor(cf) }
 
         if (columnFamilies.isEmpty()) {
             columnFamilies = listOf(ColumnFamilyDescriptor(RocksDB.DEFAULT_COLUMN_FAMILY))
@@ -94,9 +99,9 @@ class KvStore(private val provider: RocksDbProvider, private val mapper: ObjectM
 }
 
 data class ProcessingKey(
-        val aggregationUnit: String,
-        val timestamp: Long = System.currentTimeMillis(),
-        val date: String = DateTimeFormatter.ISO_INSTANT.format(Instant.ofEpochMilli(timestamp))
+    val aggregationUnit: String,
+    val timestamp: Long = System.currentTimeMillis(),
+    val date: String = DateTimeFormatter.ISO_INSTANT.format(Instant.ofEpochMilli(timestamp))
 )
 
 data class ProcessingMessage(val key: ProcessingKey, val message: String) {

cloud/infrastructure/integration-tools/src/main/kotlin/org/corfudb/cloud/infrastructure/integration/loader/LoaderCommand.kt

@@ -44,7 +44,8 @@ class LoaderManager(
                         "--name ${aggregationUnit}-${archive.name} " +
                         "-v log-aggregation-data:/data " +
                         "${toolConfig.filebeatImage} " +
-                        "filebeat -e --strict.perms=false " +
+                        "filebeat" +
+                        " -e --strict.perms=false " +
                         "-E fields.server=${archive.name} " +
                         "-E fields.aggregation_unit=${aggregationUnit} " +
                         "-E BASE_DIR=/data/${aggregationUnit}/${archive.name} " +

cloud/infrastructure/integration-tools/src/main/kotlin/org/corfudb/cloud/infrastructure/integration/server/Server.kt

@@ -19,16 +19,16 @@ import io.ktor.routing.get
 import io.ktor.routing.post
 import io.ktor.routing.routing
 import io.ktor.util.KtorExperimentalAPI
-import java.io.File
-import java.io.PrintWriter
-import java.io.StringWriter
 import kotlinx.coroutines.async
 import org.corfudb.cloud.infrastructure.integration.ArchiveConfig
 import org.corfudb.cloud.infrastructure.integration.IntegrationToolConfig
 import org.corfudb.cloud.infrastructure.integration.kv.KvStore
 import org.corfudb.cloud.infrastructure.integration.kv.ProcessingMessage
 import org.corfudb.cloud.infrastructure.integration.kv.RocksDbManager
 import org.corfudb.cloud.infrastructure.integration.processing.ProcessingManager
+import java.io.File
+import java.io.PrintWriter
+import java.io.StringWriter
 
 @KtorExperimentalAPI
 @kotlin.jvm.JvmOverloads
@@ -107,7 +107,12 @@ fun Application.module(testing: Boolean = false) {
                     try {
                         ProcessingManager(kvStore, request.aggregationUnit, config).execute()
                     } catch (ex: Exception) {
-                        kvStore.put(ProcessingMessage.new(request.aggregationUnit, "Processing error"))
+                        val sw = StringWriter()
+                        val pw = PrintWriter(sw)
+                        ex.printStackTrace(pw)
+                        val sStackTrace = sw.toString()
+                        val errStr = "Processing error: $sStackTrace"
+                        kvStore.put(ProcessingMessage.new(request.aggregationUnit, errStr))
                     }
                 }
 

cloud/infrastructure/integration-tools/src/test/kotlin/org/corfudb/cloud/infrastructure/integration/processing/KvStoreTest.kt

@@ -2,7 +2,11 @@ package org.corfudb.cloud.infrastructure.integration.processing
 
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import org.corfudb.cloud.infrastructure.integration.kv.*
+import org.corfudb.cloud.infrastructure.integration.kv.KvStore
+import org.corfudb.cloud.infrastructure.integration.kv.ProcessingKey
+import org.corfudb.cloud.infrastructure.integration.kv.ProcessingMessage
+import org.corfudb.cloud.infrastructure.integration.kv.RocksDbConfig
+import org.corfudb.cloud.infrastructure.integration.kv.RocksDbProvider
 import org.junit.Test
 import org.rocksdb.ColumnFamilyDescriptor
 import org.rocksdb.ColumnFamilyHandle

cloud/infrastructure/kibana/kibana-tools/src/main/kotlin/org/corfudb/cloud/infrastructure/kibana/tools/KibanaDashboard.kt

@@ -6,13 +6,13 @@ import org.apache.commons.lang3.RandomStringUtils
 import org.slf4j.LoggerFactory
 import java.nio.file.Path
 import java.nio.file.Paths
-import java.util.*
+import java.util.UUID
 
 data class DashboardConfig(
-        var aggregationUnit: String = "corfu",
-        var configFiles: List<Path> = listOf(),
+    var aggregationUnit: String = "corfu",
+    var configFiles: List<Path> = listOf(),
 
-        val indexPatternConfigFile: Path = Paths.get("index-pattern.json")
+    val indexPatternConfigFile: Path = Paths.get("index-pattern.json")
 )
 
 class Dashboards(private val config: DashboardConfig) {