Update Operation might hang (rarely) when retrying on invalid shard s…

…tate

The retry logic when failing does not reset the operation started flag...
closes #3769

src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java

@@ -192,7 +192,10 @@ public void run() {
                                 shardOperation(request, listener);
                             } catch (Throwable e) {
                                 if (retryOnFailure(e)) {
-                                    retry(fromClusterEvent, null);
+                                    operationStarted.set(false);
+                                    // we already marked it as started when we executed it (removed the listener) so pass false
+                                    // to re-add to the cluster listener
+                                    retry(false, null);
                                 } else {
                                     listener.onFailure(e);
                                 }