From 2a9388912bc7e73381eb8b4d39fe03462abc7cb9 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Mon, 28 Mar 2016 13:34:18 -0400
Subject: [PATCH] Add clarifying comment on disrupted in-flight ops

---
 .../replication/TransportReplicationAction.java       | 11 -----------
 .../discovery/DiscoveryWithServiceDisruptionsIT.java  |  8 ++------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
index 3bb98f82b4c..1fdd35edccf 100644
--- a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
+++ b/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
@@ -818,17 +818,6 @@ public abstract class TransportReplicationAction<Request extends ReplicationRequ
         assert setupShardReferenceAssertions();
     }
 
-    static public void assertAllShardReferencesAreCleaned() {
-        if (openShardReferences == null || openShardReferences.isEmpty()) {
-            return;
-        }
-        StringBuilder sb = new StringBuilder();
-        for (String desc : openShardReferences.values()) {
-            sb.append(desc).append("\n");
-        }
-        assert sb.length() == 0 : "Found unclosed shard references:\n" + sb;
-    }
-
     /**
      * returns a new reference to {@link IndexShard} to perform a primary operation. Released after performing primary operation locally
      * and replication of the operation to all replica shards is completed / failed (see {@link ReplicationPhase}).
diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
index a6026491e75..62b645fceda 100644
--- a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
+++ b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
@@ -141,12 +141,8 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase {
     @Override
     protected void beforeIndexDeletion() {
         // some test may leave operations in flight
-//        try {
-////            assertBusy(() -> TransportReplicationAction.assertAllShardReferencesAreCleaned());
-////            assertBusy(() -> super.beforeIndexDeletion());
-//        } catch (Exception e) {
-//            throw new AssertionError(e);
-//        }
+        // this is because the disruption schemes swallow requests by design
+        // as such, these operations will never be marked as finished
     }
 
     private List<String> startCluster(int numberOfNodes) throws ExecutionException, InterruptedException {