From 50940c26fd7d6fd9190a38994aec7700a0ab99b9 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Fri, 23 Jun 2023 09:32:24 +0200 Subject: [PATCH] ActionListener.run --- .../org/elasticsearch/index/shard/IndexShard.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java index 612909aad9545..cca52257122b3 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -3747,7 +3747,7 @@ ReplicationTracker getReplicationTracker() { * Executes a scheduled refresh if necessary. Completes the listener with true if a refreshed was performed otherwise false. */ public void scheduledRefresh(ActionListener listener) { - try { + ActionListener.run(listener, l -> { verifyNotClosed(); boolean listenerNeedsRefresh = refreshListeners.refreshNeeded(); final Engine engine = getEngine(); @@ -3762,19 +3762,17 @@ && isSearchIdle() // cause the next schedule to refresh. engine.maybePruneDeletes(); // try to prune the deletes in the engine if we accumulated some setRefreshPending(engine); - listener.onResponse(false); + l.onResponse(false); return; } else { logger.trace("refresh with source [schedule]"); - engine.maybeRefresh("schedule", listener.map(Engine.RefreshResult::refreshed)); + engine.maybeRefresh("schedule", l.map(Engine.RefreshResult::refreshed)); return; } } engine.maybePruneDeletes(); // try to prune the deletes in the engine if we accumulated some - listener.onResponse(false); - } catch (Exception e) { - listener.onFailure(e); - } + l.onResponse(false); + }); } /**