Flyway migrering kan gjøres etter at applikasjon startes for å unngå nedetid

src/main/kotlin/no/nav/k9/los/Configuration.kt

@@ -40,6 +40,8 @@ data class Configuration(private val config: ApplicationConfig) {
         password = config.getOptionalString("nav.db.password", secret = true)
     )
 
+    internal val synkronMigrering = config.getOptionalString("nav.db.synkron_migrering", secret = false)?.toBoolean() ?: true
+
     internal fun getAksjonspunkthendelseTopic(): String {
         if (k9SakConsumerAiven()) {
             return config.getOptionalString("nav.kafka.aksjonshendelseTopic", secret = false)

src/main/kotlin/no/nav/k9/los/K9Los.kt

@@ -35,6 +35,7 @@ import no.nav.helse.dusseldorf.ktor.jackson.JacksonStatusPages
 import no.nav.helse.dusseldorf.ktor.jackson.dusseldorfConfigured
 import no.nav.helse.dusseldorf.ktor.metrics.MetricsRoute
 import no.nav.helse.dusseldorf.ktor.metrics.init
+import no.nav.k9.los.db.migrate
 import no.nav.k9.los.eventhandler.*
 import no.nav.k9.los.integrasjon.kafka.AsynkronProsesseringV1Service
 import no.nav.k9.los.integrasjon.sakogbehandling.SakOgBehandlingProducer
@@ -106,12 +107,6 @@ fun Application.k9Los() {
 
     val koin = getKoin()
 
-    koin.get<OmrådeSetup>().setup()
-    koin.get<K9SakTilLosAdapterTjeneste>().setup()
-    koin.get<K9KlageTilLosAdapterTjeneste>().setup()
-    koin.get<K9PunsjTilLosAdapterTjeneste>().setup()
-    koin.get<K9TilbakeTilLosAdapterTjeneste>().setup()
-
     konfigurerJobber(koin, configuration)
 
     install(Authentication) {
@@ -281,10 +276,6 @@ fun Application.k9Los() {
         )
 
         if ((KoinProfile.LOCAL == koin.get<KoinProfile>())) {
-            localSetup.initSaksbehandlere()
-            localSetup.initPunsjoppgaver(0)
-            localSetup.initTilbakeoppgaver(0)
-            localSetup.initK9SakOppgaver(0)
             api()
         } else {
             authenticate(*issuers.allIssuers()) {
@@ -396,6 +387,40 @@ fun Application.konfigurerJobber(koin: Koin, configuration: Configuration) {
     val utvidetArbeidstid = Tidsvindu.hverdager(5, 20)
 
     val planlagteJobber = buildSet {
+        if (!configuration.synkronMigrering) {
+            add(
+                PlanlagtJobb.Oppstart(
+                    navn = "FlywayMigrering",
+                    prioritet = 0,
+                ) {
+                    migrate(configuration)
+                }
+            )
+        }
+
+        add(PlanlagtJobb.Oppstart(
+            navn = "Setup",
+            prioritet = 1,
+        ) {
+            koin.get<OmrådeSetup>().setup()
+            koin.get<K9SakTilLosAdapterTjeneste>().setup()
+            koin.get<K9KlageTilLosAdapterTjeneste>().setup()
+            koin.get<K9PunsjTilLosAdapterTjeneste>().setup()
+            koin.get<K9TilbakeTilLosAdapterTjeneste>().setup()
+        })
+
+        if (configuration.koinProfile == KoinProfile.LOCAL) {
+            add(PlanlagtJobb.Oppstart(
+                navn = "Testdata",
+                prioritet = 1,
+            ) {
+                localSetup.initSaksbehandlere()
+                localSetup.initPunsjoppgaver(0)
+                localSetup.initTilbakeoppgaver(0)
+                localSetup.initK9SakOppgaver(0)
+            })
+        }
+
         add(
             PlanlagtJobb.KjørPåTidspunkt(
                 "K9SakTilLosHistorikkvask",

src/main/kotlin/no/nav/k9/los/db/HikariConfig.kt

@@ -18,10 +18,12 @@ fun createHikariConfig(jdbcUrl: String, username: String? = null, password: Stri
         driverClassName = "org.postgresql.Driver"
         username?.let { this.username = it }
         password?.let { this.password = it }
-        setMetricsTrackerFactory(PrometheusMetricsTrackerFactory())
+        metricsTrackerFactory = PrometheusMetricsTrackerFactory()
     }
 
-fun Application.hikariConfig(hikariConfig: Configuration): HikariDataSource {
-    migrate(hikariConfig)
-    return getDataSource(hikariConfig)
+fun Application.hikariConfig(configuration: Configuration): HikariDataSource {
+    if (configuration.synkronMigrering) {
+        migrate(configuration)
+    }
+    return getDataSource(configuration)
 }

src/main/kotlin/no/nav/k9/los/db/Postgres.kt

@@ -1,50 +1,51 @@
 package no.nav.k9.los.db
 
 import com.zaxxer.hikari.HikariDataSource
-import io.ktor.server.application.Application
+import io.ktor.server.application.*
 import no.nav.k9.los.Configuration
 import no.nav.k9.los.KoinProfile
 import no.nav.vault.jdbc.hikaricp.HikariCPVaultUtil
 import org.flywaydb.core.Flyway
 import java.util.*
 import javax.sql.DataSource
+import kotlin.time.measureTimedValue
 
 enum class Role {
     Admin, User, ReadOnly;
 
     override fun toString() = name.lowercase(Locale.getDefault())
 }
 
-fun Application.getDataSource(configuration: Configuration): HikariDataSource =
+fun getDataSource(configuration: Configuration): HikariDataSource =
     if (configuration.koinProfile() == KoinProfile.LOCAL) {
         HikariDataSource(configuration.hikariConfig())
     } else {
         dataSourceFromVault(configuration, Role.User)
     }
 
-fun Application.dataSourceFromVault(hikariConfig: Configuration, role: Role): HikariDataSource =
+fun dataSourceFromVault(hikariConfig: Configuration, role: Role): HikariDataSource =
     HikariCPVaultUtil.createHikariDataSourceWithVaultIntegration(
         hikariConfig.hikariConfig(),
         hikariConfig.getVaultDbPath(),
         "${hikariConfig.databaseName()}-$role"
     )
 
-fun Application.migrate(configuration: Configuration) =
-    if (configuration.koinProfile() == KoinProfile.LOCAL) {
-        runMigration(HikariDataSource(configuration.hikariConfig()))
-    } else {
-        runMigration(
-            dataSourceFromVault(configuration, Role.Admin), "SET ROLE \"${configuration.databaseName()}-${Role.Admin}\""
-        )
+fun Application.migrate(configuration: Configuration) {
+    log.info("Migrerer database")
+    val (antallMigrert, tidsbruk) = measureTimedValue {
+        if (configuration.koinProfile() == KoinProfile.LOCAL) {
+            runMigration(HikariDataSource(configuration.hikariConfig()))
+        } else {
+            runMigration(
+                dataSourceFromVault(configuration, Role.Admin),
+                "SET ROLE \"${configuration.databaseName()}-${Role.Admin}\""
+            )
+        }
     }
+    log.info("Migrert database, antallMigrert={} tidsbruk={}", antallMigrert, tidsbruk)
+}
 
 fun runMigration(dataSource: DataSource, initSql: String? = null): Int {
-    Flyway.configure()
-        .locations("migreringer/")
-        .dataSource(dataSource)
-        .initSql(initSql)
-        .load()
-
     return Flyway.configure()
         .locations("migreringer/")
         .dataSource(dataSource)

src/test/kotlin/no/nav/k9/los/TestConfiguration.kt

@@ -51,6 +51,7 @@ object TestConfiguration {
         map["nav.db.url"] = "jdbc:postgresql://localhost:5432/k9los_unit"
         map["nav.db.username"] = "k9los_unit"
         map["nav.db.password"] = "k9los_unit"
+        map["nav.db.synkron_migrering"] = "false"
         map["nav.features.nyOppgavestyring"] = "true"
         map["nav.features.nyOppgavestyringRestApi"] = "true"
         map["nav.kafka.åpenStatistikkBehandlingTopic"] = "aapen-k9statistikk-behandling-v2"