From fb39bb05e816a06900cebefc62d38b48786d7f2a Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 8 Jul 2019 08:22:26 +0100 Subject: [PATCH] Only call assertNotTransportThread if asserts on (#44028) In #44000 we introduced some calls to `assertNotTransportThread` that are executed whether assertions are enabled or not. Although they have no effect if assertions are disabled, we should have done it like this instead. --- .../indices/recovery/RecoverySourceHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java index 8b681dee0c939..b93809e42217c 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java @@ -149,7 +149,7 @@ public void recoverToTarget(ActionListener listener) { throw e; }); final Consumer onFailure = e -> { - Transports.assertNotTransportThread("failure of recovery from " + shard.routingEntry() + " to " + request.targetNode()); + assert Transports.assertNotTransportThread(RecoverySourceHandler.this + "[onFailure]"); IOUtils.closeWhileHandlingException(releaseResources, () -> wrappedListener.onFailure(e)); }; @@ -226,7 +226,7 @@ public void recoverToTarget(ActionListener listener) { } deleteRetentionLeaseStep.whenComplete(ignored -> { - Transports.assertNotTransportThread(RecoverySourceHandler.this + "[phase1]"); + assert Transports.assertNotTransportThread(RecoverySourceHandler.this + "[phase1]"); phase1(safeCommitRef.getIndexCommit(), shard.getLastKnownGlobalCheckpoint(), () -> estimateNumOps, sendFileStep); }, onFailure); @@ -259,14 +259,14 @@ public void recoverToTarget(ActionListener listener) { }, onFailure); establishRetentionLeaseStep.whenComplete(r -> { - Transports.assertNotTransportThread(RecoverySourceHandler.this + "[prepareTargetForTranslog]"); + assert Transports.assertNotTransportThread(RecoverySourceHandler.this + "[prepareTargetForTranslog]"); // For a sequence based recovery, the target can keep its local translog prepareTargetForTranslog(isSequenceNumberBasedRecovery == false, shard.estimateNumberOfHistoryOperations("peer-recovery", startingSeqNo), prepareEngineStep); }, onFailure); prepareEngineStep.whenComplete(prepareEngineTime -> { - Transports.assertNotTransportThread(RecoverySourceHandler.this + "[phase2]"); + assert Transports.assertNotTransportThread(RecoverySourceHandler.this + "[phase2]"); /* * add shard to replication group (shard will receive replication requests from this point on) now that engine is open. * This means that any document indexed into the primary after this will be replicated to this replica as well