diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
index ac5b004886319..4f211db0c9337 100644
--- a/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
+++ b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
@@ -1015,6 +1015,7 @@ public void onNewClusterState(ClusterState state) {
 
                 @Override
                 public void onClusterServiceClose() {
+                    logger.error("Failed transport replication action because close {}", TransportReplicationAction.super.getClass());
                     finishAsFailed(new NodeClosedException(clusterService.localNode()));
                 }
 
diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
index fbb1093828773..e2cd9f7a5255e 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
@@ -1305,6 +1305,7 @@ private void assertAllPendingWriteLimitsReleased() throws Exception {
                 final long coordinatingBytes = indexingPressure.stats().getCurrentCoordinatingBytes();
                 final long primaryBytes = indexingPressure.stats().getCurrentPrimaryBytes();
                 if (combinedBytes > 0) {
+                    logger.error("Outstanding tasks: \n{}", client().admin().cluster().prepareListTasks(nodeAndClient.name).get());
                     throw new AssertionError(
                         "pending combined bytes ["
                             + combinedBytes