Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ktor): scalability for server #559

Merged
merged 6 commits into from
Dec 12, 2024
+20 −11
Merged

fix(ktor): scalability for server #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b8f522
fix(ktor): scalability for server
ybelMekk Dec 5, 2024
47d110f
fix(server): without setting limit for cpu, not overloading
ybelMekk Dec 5, 2024
f4a131d
fix(server): more robust handling of scale, ensure that the callGroup…
ybelMekk Dec 5, 2024
77d1beb
fix(server): remove comment
ybelMekk Dec 5, 2024
62da450
update(build): update deps
ybelMekk Dec 6, 2024
48220ed
update(metrics): max replicas is 12, so assure the number of concurre…
ybelMekk Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ val kotestVersion = "5.9.1"
val kotlinLoggingVersion = "3.0.5"
val kotlinVersion = "2.0.21"
val kotliqueryVersion = "1.9.0"
val ktorVersion = "3.0.1"
val ktorVersion = "3.0.2"
val logbackVersion = "1.5.12"
val logstashLogbackEncoderVersion = "8.0"
val micrometerRegistryPrometheusVersion = "1.14.0"
Expand Down Expand Up @@ -54,6 +54,13 @@ repositories {
mavenCentral()
}


configurations.all {
resolutionStrategy {
force("org.apache.commons:commons-compress:1.26.0")
}
}

dependencies {
implementation(kotlin("stdlib"))
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
Expand Down
3 changes: 3 additions & 0 deletions charts/templates/tokendings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ spec:
databases:
- name: tokendings
envVarPrefix: DB
flags:
- name: max_connections
value: "300"
ingresses:
- "{{- include "tokenx.tokendings.URL" . }}"
{{- if .Values.tokendings.mapSubjectTokenClaims }}
Expand Down
15 changes: 7 additions & 8 deletions src/main/kotlin/io/nais/security/oauth2/TokenExchangeApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import io.micrometer.prometheus.PrometheusConfig
import io.micrometer.prometheus.PrometheusMeterRegistry
import io.nais.security.oauth2.authentication.clientRegistrationAuth
import io.nais.security.oauth2.config.AppConfiguration
import io.nais.security.oauth2.config.HikariProperties
import io.nais.security.oauth2.config.configByProfile
import io.nais.security.oauth2.config.isNonProd
import io.nais.security.oauth2.metrics.Metrics
Expand Down Expand Up @@ -81,15 +82,17 @@ fun main() {

fun server(): EmbeddedServer<NettyApplicationEngine, NettyApplicationEngine.Configuration> {
val config = configByProfile()
val processors = Runtime.getRuntime().availableProcessors()
val maxConnectionPool = if (isNonProd()) HikariProperties.MAX_POOL_SIZE_NON_PROD else HikariProperties.MAX_POOL_SIZE_PROD
return embeddedServer(
Netty,
configure = {
connector {
port = config.serverProperties.port
}
connectionGroupSize = 8
workerGroupSize = 8
callGroupSize = 16
connectionGroupSize = maxOf(1, processors / 2)
workerGroupSize = processors
callGroupSize = maxOf(1, minOf(processors * 2, maxConnectionPool))
},
module = {
tokenExchangeApp(config, DefaultRouting(config))
Expand Down Expand Up @@ -149,11 +152,7 @@ fun Application.tokenExchangeApp(config: AppConfiguration, routing: ApiRouting)
call.respondWithError(cause, includeErrorDetails)
}

is BadRequestException -> {
call.respond(HttpStatusCode.BadRequest, "invalid request content")
}

is JsonProcessingException -> {
is BadRequestException, is JsonProcessingException -> {
call.respond(HttpStatusCode.BadRequest, "invalid request content")
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/io/nais/security/oauth2/config/DatabaseConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ object HikariProperties {
const val IDLE_TIMEOUT_PROD = 300000L
const val CONNECTION_TIMEOUT_PROD = 5000L
const val MAX_LIFETIME_PROD = 1800000L
const val MAX_POOL_SIZE_PROD = 10
const val MIN_IDLE_CONNECTIONS_PROD = 5
const val MAX_POOL_SIZE_PROD = 20
const val MIN_IDLE_CONNECTIONS_PROD = 10

// Non-production-specific
const val IDLE_TIMEOUT_NON_PROD = 600000L
Expand Down
Loading