Comments

Author: jasontedor

core/src/main/java/org/elasticsearch/index/shard/IndexShard.java

@@ -360,8 +360,8 @@ public void updatePrimaryTerm(final long newPrimaryTerm) {
                 assert newPrimaryTerm > primaryTerm :
                         "primary terms can only go up; current term [" + primaryTerm + "], new term [" + newPrimaryTerm + "]";
                 /*
-                 * Before this call returns, we are guarantee that all future operations are delayed and so this happens before we increment
-                 * the primary term.
+                 * Before this call returns, we are guaranteed that all future operations are delayed and so this happens before we
+                 * increment the primary term.
                  */
                 indexShardOperationPermits.asyncBlockOperations(
                         30,

core/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java

@@ -107,7 +107,8 @@ <E extends Exception> void syncBlockOperations(
     /**
      * Immediately delays operations and on another thread waits for in-flight operations to finish and then executes {@code onBlocked}
      * under the guarantee that no new operations are started. Delayed operations are run after {@code onBlocked} has executed. After
-     * operations are delayed and the blocking is forked to another thread, returns to the caller.
+     * operations are delayed and the blocking is forked to another thread, returns to the caller. If a failure occurs while blocking
+     * operations or executing {@code onBlocked} then the {@code onFailure} handler will be invoked.
      *
      * @param timeout   the maximum time to wait for the in-flight operations block
      * @param timeUnit  the time unit of the {@code timeout} argument