fix: reuse connections to fix all known connection bugs

dayyeeet · dayyeeet · commit 17d4c0bb825c · 2024-10-12T19:51:55.000+02:00
diff --git a/controller-runtime/build.gradle.kts b/controller-runtime/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 
 dependencies {
     api(project(":controller-shared"))
-    api(rootProject.libs.kotlinCoroutines)
     api(rootProject.libs.bundles.jooq)
     api(rootProject.libs.sqliteJdbc)
     jooqCodegen(rootProject.libs.jooqMetaExtensions)
diff --git a/controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/host/ServerHostRepository.kt b/controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/host/ServerHostRepository.kt
@@ -4,8 +4,10 @@ import app.simplecloud.controller.runtime.Repository
 import app.simplecloud.controller.runtime.server.ServerRepository
 import app.simplecloud.controller.shared.host.ServerHost
 import io.grpc.ConnectivityState
+import io.grpc.ManagedChannel
 import kotlinx.coroutines.coroutineScope
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit
 
 class ServerHostRepository : Repository<ServerHost, ServerRepository> {
 
@@ -26,15 +28,16 @@ class ServerHostRepository : Repository<ServerHost, ServerRepository> {
     suspend fun areServerHostsAvailable(): Boolean {
         return coroutineScope {
             return@coroutineScope hosts.any {
-                val channel = it.value.createChannel()
+                val channel = it.value.stub.channel as ManagedChannel
                 val state = channel.getState(true)
-                channel.shutdown()
                 state == ConnectivityState.IDLE || state == ConnectivityState.READY
             }
         }
     }
 
     override suspend fun delete(element: ServerHost): Boolean {
+        val host = hosts.get(element.id) ?: return false
+        (host.stub.channel as ManagedChannel).shutdown().awaitTermination(5L, TimeUnit.SECONDS)
         return hosts.remove(element.id, element)
     }
 
diff --git a/controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/server/ServerService.kt b/controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/server/ServerService.kt
@@ -29,7 +29,7 @@ class ServerService(
     private val logger = LogManager.getLogger(ServerService::class.java)
 
     override suspend fun attachServerHost(request: AttachServerHostRequest): ServerHostDefinition {
-        val serverHost = ServerHost.fromDefinition(request.serverHost)
+        val serverHost = ServerHost.fromDefinition(request.serverHost, authCallCredentials)
         try {
             hostRepository.delete(serverHost)
             hostRepository.save(serverHost)
@@ -39,21 +39,17 @@ class ServerService(
         logger.info("Successfully registered ServerHost ${serverHost.id}.")
 
         coroutineScope {
-            val channel = serverHost.createChannel()
-            val stub =
-                ServerHostServiceGrpcKt.ServerHostServiceCoroutineStub(channel).withCallCredentials(authCallCredentials)
             serverRepository.findServersByHostId(serverHost.id).forEach { server ->
                 logger.info("Reattaching Server ${server.uniqueId} of group ${server.group}...")
                 try {
-                    val result = stub.reattachServer(server.toDefinition())
+                    val result = serverHost.stub.reattachServer(server.toDefinition())
                     serverRepository.save(Server.fromDefinition(result))
                     logger.info("Success!")
                 } catch (e: Exception) {
                     logger.error("Server was found to be offline, unregistering...")
                     serverRepository.delete(server)
                 }
             }
-            channel.shutdown()
         }
         return serverHost.toDefinition()
     }
@@ -73,7 +69,7 @@ class ServerService(
         val server = serverRepository.findServerByNumerical(request.groupName, request.numericalId.toInt())
             ?: throw StatusException(Status.NOT_FOUND.withDescription("No server was found matching this group and numerical id"))
         try {
-            return stopServer(server.toDefinition())
+            return stopServer(server.toDefinition(), request.stopCause)
         } catch (e: Exception) {
             throw StatusException(
                 Status.INTERNAL.withDescription("Error occured whilest cleaning up stopped server: ").withCause(e)
@@ -167,9 +163,7 @@ class ServerService(
         val numericalId = numericalIdRepository.findNextNumericalId(group.name)
         val server = buildServer(group, numericalId, forwardingSecret)
         serverRepository.save(server)
-        val channel = host.createChannel()
-        val stub = ServerHostServiceGrpcKt.ServerHostServiceCoroutineStub(channel)
-            .withCallCredentials(authCallCredentials)
+        val stub = host.stub
         serverRepository.save(server)
         try {
             val result = stub.startServer(
@@ -179,12 +173,10 @@ class ServerService(
                     .build()
             )
             serverRepository.save(Server.fromDefinition(result))
-            channel.shutdown()
             return result
         } catch (e: Exception) {
             serverRepository.delete(server)
             numericalIdRepository.removeNumericalId(group.name, server.numericalId)
-            channel.shutdown()
             logger.error("Error whilst starting server:", e)
             throw e
         }
@@ -206,7 +198,7 @@ class ServerService(
                 .setUniqueId(UUID.randomUUID().toString().replace("-", "")).putAllCloudProperties(
                     mapOf(
                         *group.properties.entries.map { it.key to it.value }.toTypedArray(),
-                        "forwarding-secret" to forwardingSecret,
+                        "forwarding-secret" to forwardingSecret
                     )
                 ).build()
         )
@@ -216,32 +208,30 @@ class ServerService(
         val server = serverRepository.find(request.serverId)
             ?: throw StatusException(Status.NOT_FOUND.withDescription("No server was found matching this id."))
         try {
-            val stopped = stopServer(server.toDefinition())
-            pubSubClient.publish(
-                "event", ServerStopEvent.newBuilder()
-                    .setServer(stopped)
-                    .setStoppedAt(ProtoBufTimestamp.fromLocalDateTime(LocalDateTime.now()))
-                    .setStopCause(request.stopCause)
-                    .setTerminationMode(ServerTerminationMode.UNKNOWN_MODE) //TODO: Add proto fields to make changing this possible
-                    .build()
-            )
+            val stopped = stopServer(server.toDefinition(), request.stopCause)
             return stopped
         } catch (e: Exception) {
             throw StatusException(Status.INTERNAL.withDescription("Error whilst stopping server").withCause(e))
         }
     }
 
-    private suspend fun stopServer(server: ServerDefinition): ServerDefinition {
+    private suspend fun stopServer(server: ServerDefinition, cause: ServerStopCause = ServerStopCause.NATURAL_STOP): ServerDefinition {
         val host = hostRepository.findServerHostById(server.hostId)
             ?: throw Status.NOT_FOUND
                 .withDescription("No server host was found matching this server.")
                 .asRuntimeException()
-        val channel = host.createChannel()
-        val stub = ServerHostServiceGrpcKt.ServerHostServiceCoroutineStub(channel)
-            .withCallCredentials(authCallCredentials)
+        val stub = host.stub
         try {
             val stopped = stub.stopServer(server)
-            channel.shutdown()
+            pubSubClient.publish(
+                "event", ServerStopEvent.newBuilder()
+                    .setServer(stopped)
+                    .setStoppedAt(ProtoBufTimestamp.fromLocalDateTime(LocalDateTime.now()))
+                    .setStopCause(cause)
+                    .setTerminationMode(ServerTerminationMode.UNKNOWN_MODE) //TODO: Add proto fields to make changing this possible
+                    .build()
+            )
+            serverRepository.delete(Server.fromDefinition(stopped))
             return stopped
         } catch (e: Exception) {
             logger.error("Server stop error occured:", e)
diff --git a/controller-shared/build.gradle.kts b/controller-shared/build.gradle.kts
@@ -3,4 +3,5 @@ dependencies {
     api(rootProject.libs.simpleCloudPubSub)
     api(rootProject.libs.bundles.configurate)
     api(rootProject.libs.clikt)
+    api(rootProject.libs.kotlinCoroutines)
 }
diff --git a/controller-shared/src/main/kotlin/app/simplecloud/controller/shared/host/ServerHost.kt b/controller-shared/src/main/kotlin/app/simplecloud/controller/shared/host/ServerHost.kt
@@ -1,6 +1,8 @@
 package app.simplecloud.controller.shared.host
 
+import app.simplecloud.controller.shared.auth.AuthCallCredentials
 import build.buf.gen.simplecloud.controller.v1.ServerHostDefinition
+import build.buf.gen.simplecloud.controller.v1.ServerHostServiceGrpcKt
 import io.grpc.ManagedChannel
 import io.grpc.ManagedChannelBuilder
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
@@ -9,7 +11,8 @@ import org.spongepowered.configurate.objectmapping.ConfigSerializable
 data class ServerHost(
     val id: String,
     val host: String,
-    val port: Int
+    val port: Int,
+    val stub: ServerHostServiceGrpcKt.ServerHostServiceCoroutineStub,
 ) {
 
     fun toDefinition(): ServerHostDefinition {
@@ -22,18 +25,23 @@ data class ServerHost(
 
     companion object {
         @JvmStatic
-        fun fromDefinition(serverHostDefinition: ServerHostDefinition): ServerHost {
+        fun fromDefinition(serverHostDefinition: ServerHostDefinition, credentials: AuthCallCredentials): ServerHost {
             return ServerHost(
                 serverHostDefinition.hostId,
                 serverHostDefinition.hostHost,
-                serverHostDefinition.hostPort
+                serverHostDefinition.hostPort,
+                ServerHostServiceGrpcKt.ServerHostServiceCoroutineStub(
+                    createChannel(
+                        serverHostDefinition.hostHost,
+                        serverHostDefinition.hostPort
+                    )
+                ).withCallCredentials(credentials),
             )
         }
-    }
-
 
-    fun createChannel(): ManagedChannel {
-        return ManagedChannelBuilder.forAddress(host, port).usePlaintext().build()
+        @JvmStatic
+        fun createChannel(host: String, port: Int): ManagedChannel {
+            return ManagedChannelBuilder.forAddress(host, port).usePlaintext().build()
+        }
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,5 @@ dependencies {`
`3`	`3`	`api(rootProject.libs.simpleCloudPubSub)`
`4`	`4`	`api(rootProject.libs.bundles.configurate)`
`5`	`5`	`api(rootProject.libs.clikt)`
	`6`	`+ api(rootProject.libs.kotlinCoroutines)`
`6`	`7`	`}`