Improve code and reduce indexing

Index less docs to reduce runtime of test and improve code checking for
partial shard failures to only check flag/successful ops once.

Author: henningandersen

server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java

@@ -140,7 +140,7 @@ public final void executeNextPhase(SearchPhase currentPhase, SearchPhase nextPha
         } else {
             Boolean allowPartialResults = request.allowPartialSearchResults();
             assert allowPartialResults != null : "SearchRequest missing setting for allowPartialSearchResults";
-            if (allowPartialResults == false && shardFailures.get() != null) {
+            if (allowPartialResults == false && successfulOps.get() != getNumShards()) {
                 // check if there are actual failures in the atomic array since
                 // successful retries can reset the failures to null
                 ShardOperationFailedException[] shardSearchFailures = buildShardFailures();
@@ -154,18 +154,17 @@ public final void executeNextPhase(SearchPhase currentPhase, SearchPhase nextPha
                     }
                     onPhaseFailure(currentPhase, "Partial shards failure", null);
                     return;
+                } else {
+                    int discrepancy = getNumShards() - successfulOps.get();
+                    assert discrepancy > 0 : "discrepancy: " + discrepancy;
+                    if (logger.isDebugEnabled()) {
+                        logger.debug("Partial shards failure (unavailable: {}, successful: {}, skipped: {}, num-shards: {}, phase: {})",
+                            discrepancy, successfulOps.get(), skippedOps.get(), getNumShards(), currentPhase.getName());
+                    }
+                    onPhaseFailure(currentPhase, "Partial shards failure (" + discrepancy + " shards unavailable)", null);
+                    return;
                 }
             }
-            if (allowPartialResults == false && successfulOps.get() != getNumShards()) {
-                int discrepancy = getNumShards() - successfulOps.get();
-                assert discrepancy > 0 : "discrepancy: " + discrepancy;
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Partial shards failure (unavailable: {}, successful: {}, skipped: {}, num-shards: {}, phase: {})",
-                        discrepancy, successfulOps.get(), skippedOps.get(), getNumShards(), currentPhase.getName());
-                }
-                onPhaseFailure(currentPhase, "Partial shards failure (" + discrepancy + " shards unavailable)", null);
-                return;
-            }
             if (logger.isTraceEnabled()) {
                 final String resultsFrom = results.getSuccessfulResults()
                     .map(r -> r.getSearchShardTarget().toString()).collect(Collectors.joining(","));

server/src/test/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java

@@ -100,9 +100,9 @@ public void testClusterDisallowPartialsWithRedState() throws Exception {
     }
 
     public void testDisallowPartialsWithRedStateRecovering() throws Exception {
-        int docCount = scaledRandomIntBetween(1000, 10000);
+        int docCount = scaledRandomIntBetween(10, 1000);
         logger.info("Using docCount [{}]", docCount);
-        buildIndex(cluster().numDataNodes(), 1, docCount);
+        buildIndex(cluster().numDataNodes() + 2, 1, docCount);
 
         AtomicBoolean stop = new AtomicBoolean();
         List<Thread> searchThreads = new ArrayList<>();
@@ -128,7 +128,7 @@ public void run() {
                 void verify(Supplier<SearchResponse> call) {
                     try {
                         SearchResponse response = call.get();
-                        assertThat(response.getHits().getHits().length, equalTo(100));
+                        assertThat(response.getHits().getHits().length, equalTo(Math.min(100, docCount)));
                         assertThat(response.getHits().getTotalHits().value, equalTo((long) docCount));
                     } catch (Exception e) {
                         // this is OK.