Ensure we do not lose exceptions

jasontedor · Sep 13, 2018 · 2890693 · 2890693
1 parent d4f8a98
commit 2890693
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardChangesAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardChangesAction.java
@@ -314,10 +314,14 @@ protected void asyncShardOperation(
                             if (g == UNASSIGNED_SEQ_NO) {
                                 assert e != null;
                                 if (e instanceof TimeoutException) {
-                                    final long mappingVersion =
-                                            clusterService.state().metaData().index(shardId.getIndex()).getMappingVersion();
-                                    final SeqNoStats latestSeqNoStats = indexShard.seqNoStats();
-                                    listener.onResponse(getResponse(mappingVersion, latestSeqNoStats, EMPTY_OPERATIONS_ARRAY));
+                                    try {
+                                        final long mappingVersion =
+                                                clusterService.state().metaData().index(shardId.getIndex()).getMappingVersion();
+                                        final SeqNoStats latestSeqNoStats = indexShard.seqNoStats();
+                                        listener.onResponse(getResponse(mappingVersion, latestSeqNoStats, EMPTY_OPERATIONS_ARRAY));
+                                    } catch (final Exception caught) {
+                                        listener.onFailure(caught);
+                                    }
                                 } else {
                                     listener.onFailure(e);
                                 }