MBS-8523 Extract deployment creation logic to ReservationDeploymentFa…

…ctory.kt (#600) * MBS-8523 Extract deployment creation logic to ReservationDeploymentFactory.kt Delete usages of GlobalScope in Reservation Clients Delete GroupedCoroutinesExecution.kt Make ReservationClient.kt interface simpler
avito-tech · Oct 19, 2020 · e1feaab · e1feaab
1 parent 0bcc82e
commit e1feaab
Show file tree

Hide file tree

Showing 13 changed files with 436 additions and 589 deletions.
diff --git a/...instrumentation-tests/src/main/kotlin/com/avito/instrumentation/executing/TestExecutor.kt b/...instrumentation-tests/src/main/kotlin/com/avito/instrumentation/executing/TestExecutor.kt
@@ -6,7 +6,6 @@ import com.avito.instrumentation.reservation.client.ReservationClient
 import com.avito.instrumentation.reservation.client.ReservationClientFactory
 import com.avito.instrumentation.reservation.request.Reservation
 import com.avito.instrumentation.suite.model.TestWithTarget
-import com.avito.instrumentation.util.launchGroupedCoroutines
 import com.avito.runner.scheduler.TestsRunnerClient
 import com.avito.runner.scheduler.args.Arguments
 import com.avito.runner.scheduler.runner.model.TestRunRequest
@@ -15,8 +14,7 @@ import com.avito.runner.service.worker.device.Serial
 import com.avito.runner.service.worker.device.model.DeviceConfiguration
 import com.avito.utils.logging.CILogger
 import com.avito.utils.logging.commonLogger
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.toList
+import kotlinx.coroutines.channels.ReceiveChannel
 import kotlinx.coroutines.runBlocking
 import java.io.File
 
@@ -155,36 +153,26 @@ interface TestExecutor {
             client: ReservationClient,
             configurationName: String,
             reservations: Collection<Reservation.Data>,
-            action: (devices: Channel<Serial>) -> Unit
+            action: (devices: ReceiveChannel<Serial>) -> Unit
         ) {
-            val reservationDeployments = Channel<String>(reservations.size)
             try {
-                val serialsChannel = Channel<Serial>(Channel.UNLIMITED)
-
-                launchGroupedCoroutines {
-                    launch(blocking = false) {
-                        logger.info("Devices: Starting reservation job for configuration: $configurationName...")
-                        client.claim(
-                            reservations = reservations,
-                            serialsChannel = serialsChannel,
-                            reservationDeployments = reservationDeployments
-                        )
-                        logger.info("Devices: Reservation job completed for configuration: $configurationName")
-                    }
-                    launch {
-                        logger.info("Devices: Starting action for configuration: $configurationName...")
-                        action(serialsChannel)
-                        logger.info("Devices: Action completed for configuration: $configurationName")
-                    }
+                runBlocking {
+                    logger.info("Devices: Starting reservation job for configuration: $configurationName...")
+                    val result = client.claim(
+                        reservations = reservations
+                    )
+                    logger.info("Devices: Reservation job completed for configuration: $configurationName")
+                    logger.info("Devices: Starting action for configuration: $configurationName...")
+                    action(result.serials)
+                    logger.info("Devices: Action completed for configuration: $configurationName")
                 }
 
             } catch (e: Throwable) {
                 logger.critical("Error during starting reservation job", e)
             } finally {
-                reservationDeployments.close()
                 logger.info("Devices: Starting releasing devices for configuration: $configurationName...")
                 runBlocking {
-                    client.release(reservationDeployments = reservationDeployments.toList())
+                    client.release()
                 }
                 logger.info("Devices: Devices released for configuration: $configurationName")
             }

diff --git a/...instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/adb/Device.kt b/...instrumentation-tests/src/main/kotlin/com/avito/instrumentation/reservation/adb/Device.kt
@@ -8,7 +8,7 @@ import org.funktionale.tries.Try
 import java.io.File
 
 abstract class Device(
-    protected val serial: Serial,
+    val serial: Serial,
     protected val logger: (String) -> Unit = {}
 ) {
     private val androidHome: String? = System.getenv("ANDROID_HOME")

diff --git a/...n-tests/src/main/kotlin/com/avito/instrumentation/reservation/client/ReservationClient.kt b/...n-tests/src/main/kotlin/com/avito/instrumentation/reservation/client/ReservationClient.kt
@@ -1,15 +1,18 @@
 package com.avito.instrumentation.reservation.client
 
-import com.avito.runner.service.worker.device.Serial
 import com.avito.instrumentation.reservation.request.Reservation
-import kotlinx.coroutines.channels.SendChannel
+import com.avito.runner.service.worker.device.Serial
+import kotlinx.coroutines.channels.ReceiveChannel
 
 interface ReservationClient {
-    suspend fun claim(
-        reservations: Collection<Reservation.Data>,
-        serialsChannel: SendChannel<Serial>,
-        reservationDeployments: SendChannel<String>
+
+    class ClaimResult(
+        val serials: ReceiveChannel<Serial>
     )
 
-    suspend fun release(reservationDeployments: Collection<String>)
+    suspend fun claim(
+        reservations: Collection<Reservation.Data>
+    ): ClaimResult
+
+    suspend fun release()
 }
diff --git a/.../src/main/kotlin/com/avito/instrumentation/reservation/client/ReservationClientFactory.kt b/.../src/main/kotlin/com/avito/instrumentation/reservation/client/ReservationClientFactory.kt
@@ -5,6 +5,7 @@ import com.avito.instrumentation.executing.ExecutionParameters
 import com.avito.instrumentation.reservation.adb.AndroidDebugBridge
 import com.avito.instrumentation.reservation.adb.EmulatorsLogsReporter
 import com.avito.instrumentation.reservation.client.kubernetes.KubernetesReservationClient
+import com.avito.instrumentation.reservation.client.kubernetes.ReservationDeploymentFactory
 import com.avito.instrumentation.reservation.client.local.LocalReservationClient
 import com.avito.runner.service.worker.device.adb.AdbDevicesManager
 import com.avito.utils.gradle.KubernetesCredentials
@@ -57,13 +58,16 @@ interface ReservationClientFactory {
                         kubernetesCredentials = kubernetesCredentials,
                         namespace = executionParameters.namespace
                     ),
-                    configurationName = configuration.name,
-                    projectName = projectName,
+                    reservationDeploymentFactory = ReservationDeploymentFactory(
+                        configurationName = configuration.name,
+                        projectName = projectName,
+                        buildId = buildId,
+                        buildType = buildType,
+                        registry = registry,
+                        logger = logger
+                    ),
                     logger = logger,
-                    buildId = buildId,
-                    buildType = buildType,
-                    emulatorsLogsReporter = emulatorsLogsReporter,
-                    registry = registry
+                    emulatorsLogsReporter = emulatorsLogsReporter
                 )
             }
         }