Use releaseBefore

Author: fcofdez

server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java

@@ -41,7 +41,6 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.core.Nullable;
-import org.elasticsearch.core.Releasables;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
@@ -171,15 +170,13 @@ protected void dispatchedShardOperationOnPrimary(
         IndexShard primary,
         ActionListener<PrimaryResult<BulkShardRequest, BulkShardResponse>> outerListener
     ) {
-        var primaryOperationExpansionReleasable = indexingPressure.trackPrimaryOperationExpansion(
-            primaryOperationCount(request),
-            getMaxOperationMemoryOverhead(request),
-            force(request)
-        );
-        // Ensure that we release the accounted memory for document expansion as soon as we're done processing the operations.
-        var listener = ActionListener.runBefore(
-            outerListener,
-            () -> Releasables.closeExpectNoException(primaryOperationExpansionReleasable)
+        var listener = ActionListener.releaseBefore(
+            indexingPressure.trackPrimaryOperationExpansion(
+                primaryOperationCount(request),
+                getMaxOperationMemoryOverhead(request),
+                force(request)
+            ),
+            outerListener
         );
         ClusterStateObserver observer = new ClusterStateObserver(clusterService, request.timeout(), logger, threadPool.getThreadContext());
         performOnPrimary(request, primary, updateHelper, threadPool::absoluteTimeInMillis, (update, shardId, mappingListener) -> {
@@ -671,14 +668,9 @@ protected void dispatchedShardOperationOnReplica(
         IndexShard replica,
         ActionListener<ReplicaResult> outerListener
     ) {
-        var replicaOperationExpansionReleasable = indexingPressure.trackReplicaOperationExpansion(
-            getMaxOperationMemoryOverhead(request),
-            force(request)
-        );
-        // Ensure that we release the accounted memory for document expansion as soon as we're done processing the operations.
-        var listener = ActionListener.runBefore(
-            outerListener,
-            () -> Releasables.closeExpectNoException(replicaOperationExpansionReleasable)
+        var listener = ActionListener.releaseBefore(
+            indexingPressure.trackReplicaOperationExpansion(getMaxOperationMemoryOverhead(request), force(request)),
+            outerListener
         );
         ActionListener.completeWith(listener, () -> {
             final long startBulkTime = System.nanoTime();