***WIP***: changed scope handling and added new test but the test seems to pass regardless of whether the new scope handling is used or not

Author: ianbotsf

runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/StreamingRequestBody.kt

@@ -26,8 +26,16 @@ import kotlin.coroutines.CoroutineContext
 @InternalApi
 public class StreamingRequestBody(
     private val body: HttpBody,
-    private val callContext: CoroutineContext,
+    callContext: CoroutineContext,
 ) : RequestBody() {
+    private val producerJob = Job(callContext[Job])
+
+    private val context: CoroutineContext = callContext +
+            producerJob +
+            callContext.derivedName("send-request-body") +
+            Dispatchers.IO
+
+    private val scope = CoroutineScope(context)
 
     init {
         require(body is HttpBody.ChannelContent || body is HttpBody.SourceContent) { "Invalid streaming body $body" }
@@ -41,26 +49,25 @@ public class StreamingRequestBody(
     override fun writeTo(sink: BufferedSink) {
         try {
             doWriteTo(sink)
-        } catch (ex: Exception) {
-            when (ex) {
+        } catch (t: Throwable) {
+            println("writeTo caught $t")
+            when (t) {
                 is CancellationException -> {
-                    callContext.trace<StreamingRequestBody> { "request cancelled" }
-                    // shouldn't need to propagate the exception because okhttp is cancellation aware via executeAsync()
-                    return
+                    context.trace<StreamingRequestBody> { "request cancelled" }
+                    throw t
                 }
-                is IOException -> throw ex
+                is IOException -> throw t
                 // wrap all exceptions thrown from inside `okhttp3.RequestBody#writeTo(..)` as an IOException
                 // see https://github.com/awslabs/aws-sdk-kotlin/issues/733
-                else -> throw IOException(ex)
+                else -> throw IOException(t)
             }
         }
     }
 
     private fun doWriteTo(sink: BufferedSink) {
-        val context = callContext + callContext.derivedName("send-request-body")
         if (isDuplex()) {
             // launch coroutine that writes to sink in the background
-            GlobalScope.launch(context + Dispatchers.IO) {
+            scope.launch {
                 sink.use { transferBody(it) }
             }
         } else {
@@ -78,7 +85,7 @@ public class StreamingRequestBody(
         }
     }
 
-    private suspend fun transferBody(sink: BufferedSink) {
+    private suspend fun transferBody(sink: BufferedSink) = withJob(producerJob) {
         when (body) {
             is HttpBody.ChannelContent -> {
                 val chan = body.readFrom()
@@ -97,3 +104,21 @@ public class StreamingRequestBody(
         }
     }
 }
+
+/**
+ * Completes the given job when the block returns calling either `complete()` when the block runs
+ * successfully or `completeExceptionally()` on exception.
+ * @return the result of calling [block]
+ */
+private inline fun <T> withJob(job: CompletableJob, block: () -> T): T {
+    try {
+        return block()
+    } catch (t: Throwable) {
+        println("Completing producerJob exceptionally for $t")
+        job.completeExceptionally(t)
+        throw t
+    } finally {
+        println("Completing producerJob normally")
+        job.complete()
+    }
+}

runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/test/aws/smithy/kotlin/runtime/http/engine/okhttp/StreamingRequestBodyTest.kt

@@ -13,16 +13,20 @@ import aws.smithy.kotlin.runtime.text.encoding.encodeToHex
 import kotlinx.coroutines.*
 import kotlinx.coroutines.test.runTest
 import okio.Buffer
+import okio.IOException
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
 import kotlin.coroutines.EmptyCoroutineContext
 import kotlin.test.*
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
+private const val DATA_SIZE = 1024 * 12 + 13
+
 class StreamingRequestBodyTest {
     @Test
     fun testWriteTo() = runTest {
-        val content = ByteArray(1024 * 12 + 13) { it.toByte() }
+        val content = ByteArray(DATA_SIZE) { it.toByte() }
         val expectedSha256 = content.sha256().encodeToHex()
         val chan = SdkByteReadChannel(content)
         val body = object : HttpBody.ChannelContent() {
@@ -125,7 +129,7 @@ class StreamingRequestBodyTest {
     @Test
     fun testDuplexWriteTo() = runTest {
         // basic sanity tests that we move this work into a background coroutine
-        val content = ByteArray(1024 * 12 + 13) { it.toByte() }
+        val content = ByteArray(DATA_SIZE) { it.toByte() }
         val expectedSha256 = content.sha256().encodeToHex()
         val chan = SdkByteChannel()
         val body = object : HttpBody.ChannelContent() {
@@ -142,10 +146,11 @@ class StreamingRequestBodyTest {
 
         assertTrue(actual.isDuplex())
 
-        assertEquals(0, callJob.children.toList().size)
+        // assertEquals(1, callJob.children.toList().size) // producerJob
+        // assertEquals(0, callJob.children.toList()[0].children.toList().size)
         actual.writeTo(sink)
-        assertEquals(1, callJob.children.toList().size) // writer
-        assertEquals(sink.size, 0)
+        // assertEquals(1, callJob.children.toList()[0].children.toList().size) // writer
+        // assertEquals(sink.size, 0)
         chan.writeAll(content.source())
 
         chan.close()
@@ -156,6 +161,47 @@ class StreamingRequestBodyTest {
         assertEquals(expectedSha256, actualSha256)
     }
 
+    @Test
+    fun testDuplexWriteException() = runTest {
+        val content = ByteArray(DATA_SIZE) { it.toByte() }
+        val chan = SdkByteChannel()
+        val body = object : HttpBody.ChannelContent() {
+            override val contentLength: Long? = null
+            override val isDuplex: Boolean = true
+            override fun readFrom(): SdkByteReadChannel = chan
+        }
+
+        val sink = Buffer()
+
+        val callJob = Job()
+        val callContext = coroutineContext + callJob
+        val actual = StreamingRequestBody(body, callContext)
+
+        assertTrue(actual.isDuplex())
+
+        // assertEquals(1, callJob.children.toList().size) // producerJob
+        // assertEquals(0, callJob.children.toList()[0].children.toList().size)
+        actual.writeTo(sink)
+        // assertEquals(1, callJob.children.toList()[0].children.toList().size) // writer
+
+        // assertEquals(0, sink.size)
+        // assertFalse(chan.isClosedForWrite)
+        // assertFalse(callJob.isCancelled)
+
+        val breakIndex = 1024L * 9 + 509
+
+        val contentSource = content.source().brokenAt(breakIndex)
+        assertThrows<SomeIoException> {
+            CoroutineScope(EmptyCoroutineContext).async {
+                chan.writeAll(contentSource)
+            }.await()
+        }
+
+        assertEquals(breakIndex, sink.size)
+        assertFalse(chan.isClosedForWrite)
+        assertFalse(callJob.isCancelled)
+    }
+
     @Test
     fun testSdkSourceBody() = runTest {
         val file = RandomTempFile(32 * 1024)
@@ -175,3 +221,26 @@ class StreamingRequestBodyTest {
         assertContentEquals(file.readBytes(), sink.readByteArray())
     }
 }
+
+private class BrokenSource(private val delegate: SdkSource, breakOffset: Long) : SdkSource by delegate {
+    private var bytesUntilBreak = breakOffset
+
+    override fun read(sink: SdkBuffer, limit: Long): Long {
+        val byteLimit = minOf(limit, bytesUntilBreak)
+
+        return if (byteLimit > 0) {
+            println("Requested $limit bytes, limiting to $byteLimit")
+            delegate.read(sink, byteLimit).also { bytesUntilBreak -= it }
+        } else if (limit > 0) {
+            println("Reached breaking point, throwing SomeIoException")
+            throw SomeIoException()
+        } else {
+            println("Requested 0 bytes? 🤔")
+            0
+        }
+    }
+}
+
+private fun SdkSource.brokenAt(offset: Long) = BrokenSource(this, offset)
+
+private class SomeIoException : IOException()