diff --git a/docs/src/main/paradox/release-notes/10.1.x.md b/docs/src/main/paradox/release-notes/10.1.x.md index 8ee1d25c1a9..d94c6cd9a48 100644 --- a/docs/src/main/paradox/release-notes/10.1.x.md +++ b/docs/src/main/paradox/release-notes/10.1.x.md @@ -1,5 +1,31 @@ # 10.1.x Release Notes +## 10.1.3 + +10.1.3 is the fourth release in the 10.1.x series of Akka HTTP. + +This release addresses a critical memory leak issue introduced by the graceful termination infrastructure added in 10.1.2. +No other risky changes are made in this release, in order to make it a trustworthy fix drop-in replacement of 10.1.2. + +### **Changes since 10.1.2** + +For a full overview you can also see the [https://github.com/akka/akka-http/milestone/41?closed=1](Milestone): + +#### Fixes in akka-http-core + + * ServerTerminator memory leak in 10.1.2 ([#2067](https://github.com/akka/akka-http/issues/2067)) + * Avoid eagerly failing connections when request closes ([#2066](https://github.com/akka/akka-http/issues/2066)) + +#### Fixes in docs + + * Correct pipelining-limit flag name ([#2059](https://github.com/akka/akka-http/issues/2059)) + * Fix link to compatibility rules section ([#2062](https://github.com/akka/akka-http/issues/2062)) + +#### Improvements in docs + + * Reference documentation for Graceful Termination ([#2072](https://github.com/akka/akka-http/issues/2072)) + * Enhance Caching Documentation ([#2060](https://github.com/akka/akka-http/issues/2060)) + ## 10.1.2 10.1.2 is the third release in the 10.1.x series of Akka HTTP. diff --git a/docs/src/test/java/docs/http/javadsl/server/HttpServerExampleDocTest.java b/docs/src/test/java/docs/http/javadsl/server/HttpServerExampleDocTest.java index ef5c0b89cf0..ce03279f824 100644 --- a/docs/src/test/java/docs/http/javadsl/server/HttpServerExampleDocTest.java +++ b/docs/src/test/java/docs/http/javadsl/server/HttpServerExampleDocTest.java @@ -341,13 +341,8 @@ public static void gracefulTerminationExample() throws Exception { serverBinding.terminate(Duration.ofSeconds(3)); // once all connections are terminated, - HttpTerminated httpTerminated = onceAllConnectionsTerminated.toCompletableFuture().get(); - - // - you can invoke coordinated shutdown to tear down the rest of the system: - CoordinatedShutdown.get(system).run(); - - // - or terminate the system explicitly: - // system.terminate(); + onceAllConnectionsTerminated.toCompletableFuture(). + thenAccept(terminated -> system.terminate()); //#graceful-termination } diff --git a/docs/src/test/scala/docs/http/scaladsl/HttpServerExampleSpec.scala b/docs/src/test/scala/docs/http/scaladsl/HttpServerExampleSpec.scala index 8977483eb5f..d8552ad96fa 100644 --- a/docs/src/test/scala/docs/http/scaladsl/HttpServerExampleSpec.scala +++ b/docs/src/test/scala/docs/http/scaladsl/HttpServerExampleSpec.scala @@ -777,12 +777,8 @@ class HttpServerExampleSpec extends WordSpec with Matchers // once all connections are terminated, // - you can invoke coordinated shutdown to tear down the rest of the system: onceAllConnectionsTerminated.flatMap { _ ⇒ - CoordinatedShutdown(system).run(UnknownReason) + system.terminate() } - // - or terminate the system explicitly: - // onceAllConnectionsTerminated.flatMap { _ ⇒ - // system.terminate() - // } //#graceful-termination }