Version 2023.2.8

backend/version.txt

@@ -1 +1 @@
-2023.2.3
+2023.2.8

provider-integration/integration-module/src/main/kotlin/plugins/compute/ucloud/ContainerRuntime.kt

@@ -76,6 +76,7 @@ interface ContainerRuntime {
     }
 
     fun requiresReschedulingOfInQueueJobsOnStartup(): Boolean = false
+    fun notifyReschedulingComplete() {}
 }
 
 data class Tunnel(val hostnameOrIpAddress: String, val port: Int, val close: suspend () -> Unit)

provider-integration/integration-module/src/main/kotlin/plugins/compute/ucloud/JobManagement.kt

@@ -105,7 +105,6 @@ class JobManagement(
         val actualJob = JobsControl.retrieve.call(
             ResourceRetrieveRequest(
                 JobIncludeFlags(
-                    includeProduct = true,
                     includeApplication = true,
                     includeParameters = true,
                 ),

provider-integration/integration-module/src/main/kotlin/plugins/compute/ucloud/KubernetesResources.kt

@@ -681,7 +681,8 @@ data class Node(
     var apiVersion: String = "v1",
     var kind: String = "Node",
     var metadata: ObjectMeta? = null,
-    var status: Status? = null
+    var status: Status? = null,
+    var spec: Spec? = null,
 ) {
     @Serializable
     data class Status(
@@ -704,6 +705,11 @@ data class Node(
         @SerialName("nvidia.com/gpu")
         var nvidiaGpu: String? = null,
     )
+
+    @Serializable
+    data class Spec(
+        var unschedulable: Boolean? = null
+    )
 }
 
 @Serializable

provider-integration/integration-module/src/main/kotlin/plugins/compute/ucloud/Plugin.kt

@@ -19,6 +19,7 @@ import dk.sdu.cloud.controllers.ComputeSessionIpc
 import dk.sdu.cloud.controllers.RequestContext
 import dk.sdu.cloud.dbConnection
 import dk.sdu.cloud.ipc.IpcContainer
+import dk.sdu.cloud.ipc.IpcHandler
 import dk.sdu.cloud.ipc.handler
 import dk.sdu.cloud.ipc.sendRequest
 import dk.sdu.cloud.logThrowable
@@ -34,6 +35,7 @@ import dk.sdu.cloud.plugins.ipcServer
 import dk.sdu.cloud.plugins.rpcClient
 import dk.sdu.cloud.plugins.storage.ucloud.UCloudFilePlugin
 import dk.sdu.cloud.utils.forEachGraal
+import dk.sdu.cloud.utils.sendTerminalMessage
 import dk.sdu.cloud.utils.sendTerminalTable
 import dk.sdu.cloud.utils.whileGraal
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -42,6 +44,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.selects.select
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.serializer
 import kotlin.coroutines.coroutineContext
 
@@ -71,12 +74,15 @@ class UCloudComputePlugin : ComputePlugin, SyncthingPlugin {
 
     @OptIn(DelicateCoroutinesApi::class)
     override suspend fun PluginContext.initialize() {
+        registerCli()
         if (!config.shouldRunServerCode()) return
 
         files = config.plugins.files[pluginName] as? UCloudFilePlugin
             ?: run {
-                error("Must have storage configured for the UCloud compute plugin ($pluginName). " +
-                        "It appears that '${pluginName}' does not point to a valid UCloud storage plugin.")
+                error(
+                    "Must have storage configured for the UCloud compute plugin ($pluginName). " +
+                            "It appears that '${pluginName}' does not point to a valid UCloud storage plugin."
+                )
             }
 
         jobCache = VerifiedJobCache(rpcClient)
@@ -212,10 +218,50 @@ class UCloudComputePlugin : ComputePlugin, SyncthingPlugin {
         files.driveLocator.onEnteringMaintenanceMode {
             killJobsEnteringMaintenanceMode()
         }
+    }
 
-        if (runtime.requiresReschedulingOfInQueueJobsOnStartup()) {
-            scheduleInQueueJobs()
-        }
+    private suspend fun PluginContext.registerCli() {
+        commandLineInterface?.addHandler(CliHandler("ucloud-compute") { args ->
+            val client = ipcClient
+
+            fun sendHelp(): Nothing = sendCommandLineUsage("ucloud-compute", "UCloud Compute") {
+                subcommand(
+                    "status",
+                    "Print status of the cluster (if available). Unstable format, please submit an issue before " +
+                            "parsing this format for production use."
+                )
+            }
+
+            genericCommandLineHandler {
+                when (args.getOrNull(0)) {
+                    "status" -> {
+                        val resp = client.sendRequest(Ipc.status, Unit)
+                        sendTerminalMessage { line(resp.text) }
+                    }
+
+                    else -> {
+                        sendHelp()
+                    }
+                }
+            }
+        })
+
+        ipcServerOptional?.addHandler(Ipc.status.handler { user, request ->
+            if (user.uid != 0) throw RPCException("Not root", HttpStatusCode.Forbidden)
+
+            val rt = runtime
+            if (rt is Pod2Runtime) {
+                StringWrapper(rt.dumpState())
+            } else {
+                StringWrapper("Status unavailable for this scheduler")
+            }
+        })
+    }
+
+    @Serializable
+    private data class StringWrapper(val text: String)
+    private object Ipc : IpcContainer("ucloud_compute_cli") {
+        val status = updateHandler("status", Unit.serializer(), StringWrapper.serializer())
     }
 
     private suspend fun scheduleInQueueJobs() {
@@ -239,6 +285,11 @@ class UCloudComputePlugin : ComputePlugin, SyncthingPlugin {
     }
 
     override suspend fun PluginContext.runMonitoringLoopInServerMode() {
+        if (runtime.requiresReschedulingOfInQueueJobsOnStartup()) {
+            scheduleInQueueJobs()
+            runtime.notifyReschedulingComplete()
+        }
+
         while (coroutineContext.isActive) {
             try {
                 jobManagement.runMonitoring()
@@ -436,7 +487,10 @@ class UCloudComputePlugin : ComputePlugin, SyncthingPlugin {
             ?: throw RPCException("Not supported by provider", HttpStatusCode.BadRequest)
     }
 
-    suspend fun killJobsEnteringMaintenanceMode(dryRun: Boolean = false, dryMaintenanceMode: List<Long> = emptyList()): List<String> {
+    suspend fun killJobsEnteringMaintenanceMode(
+        dryRun: Boolean = false,
+        dryMaintenanceMode: List<Long> = emptyList()
+    ): List<String> {
         val result = ArrayList<String>()
         for (job in runtime.list()) {
             val internalMounts = job.mountedDirectories().mapNotNull { dir ->
@@ -562,22 +616,29 @@ class UCloudPublicIPPlugin : PublicIPPlugin {
         commandLineInterface?.addHandler(CliHandler("uc-ip-pool") { args ->
             val ipcClient = ipcClient
 
-            fun sendHelp(): Nothing = sendCommandLineUsage("uc-ip-pool", "View information about IPs in the public IP pool") {
-                subcommand("ls", "List the available ranges in the pool")
+            fun sendHelp(): Nothing =
+                sendCommandLineUsage("uc-ip-pool", "View information about IPs in the public IP pool") {
+                    subcommand("ls", "List the available ranges in the pool")
 
-                subcommand("rm", "Delete an entry in the pool") {
-                    arg(
-                        "externalSubnet",
-                        description = "The external IP subnet to remove from the pool. " +
-                                "This will _not_ invalidate already allocated IP addresses."
-                    )
-                }
+                    subcommand("rm", "Delete an entry in the pool") {
+                        arg(
+                            "externalSubnet",
+                            description = "The external IP subnet to remove from the pool. " +
+                                    "This will _not_ invalidate already allocated IP addresses."
+                        )
+                    }
 
-                subcommand("add", "Adds a new range to the pool") {
-                    arg("externalSubnet", description = "The external IP subnet to add to the pool. For example: 10.0.0.0/24.")
-                    arg("internalSubnet", description = "The internal IP subnet to add to the pool. For example: 10.0.0.0/24.")
+                    subcommand("add", "Adds a new range to the pool") {
+                        arg(
+                            "externalSubnet",
+                            description = "The external IP subnet to add to the pool. For example: 10.0.0.0/24."
+                        )
+                        arg(
+                            "internalSubnet",
+                            description = "The internal IP subnet to add to the pool. For example: 10.0.0.0/24."
+                        )
+                    }
                 }
-            }
 
             genericCommandLineHandler {
                 when (args.getOrNull(0)) {