Skip to content

[7.17] Correct context for batched reroute notifications (#83019) #83166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2022
Merged

[7.17] Correct context for batched reroute notifications (#83019) #83166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/83019.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 83019
summary: Correct context for batched reroute notifications
area: Allocation
type: bug
issues: []
11 changes: 8 additions & 3 deletions server/src/main/java/org/elasticsearch/cluster/routing/BatchedRerouteService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ContextPreservingActionListener;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.NotMasterException;
Expand Down Expand Up @@ -55,6 +56,10 @@ public BatchedRerouteService(ClusterService clusterService, BiFunction<ClusterSt
*/
@Override
public final void reroute(String reason, Priority priority, ActionListener<ClusterState> listener) {
final ActionListener<ClusterState> wrappedListener = ContextPreservingActionListener.wrapPreservingContext(
listener,
clusterService.getClusterApplierService().threadPool().getThreadContext()
);
final List<ActionListener<ClusterState>> currentListeners;
synchronized (mutex) {
if (pendingRerouteListeners != null) {
Expand All @@ -65,7 +70,7 @@ public final void reroute(String reason, Priority priority, ActionListener<Clust
reason,
priority
);
pendingRerouteListeners.add(listener);
pendingRerouteListeners.add(wrappedListener);
return;
} else {
logger.trace(
Expand All @@ -75,7 +80,7 @@ public final void reroute(String reason, Priority priority, ActionListener<Clust
reason
);
currentListeners = new ArrayList<>(1 + pendingRerouteListeners.size());
currentListeners.add(listener);
currentListeners.add(wrappedListener);
currentListeners.addAll(pendingRerouteListeners);
pendingRerouteListeners.clear();
pendingRerouteListeners = currentListeners;
Expand All @@ -84,7 +89,7 @@ public final void reroute(String reason, Priority priority, ActionListener<Clust
} else {
logger.trace("no pending reroute, scheduling reroute [{}] at priority [{}]", reason, priority);
currentListeners = new ArrayList<>(1);
currentListeners.add(listener);
currentListeners.add(wrappedListener);
pendingRerouteListeners = currentListeners;
pendingTaskPriority = priority;
}
Expand Down
18 changes: 14 additions & 4 deletions server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.Randomness;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.test.ClusterServiceUtils;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.threadpool.TestThreadPool;
Expand All @@ -34,6 +35,7 @@
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Function;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.lessThan;

public class BatchedRerouteServiceTests extends ESTestCase {
Expand Down Expand Up @@ -99,16 +101,24 @@ public void onFailure(String source, Exception e) {
return s;
});

final ThreadContext threadContext = threadPool.getThreadContext();
final String contextHeader = "test-context-header";

final int iterations = scaledRandomIntBetween(1, 100);
final CountDownLatch tasksSubmittedCountDown = new CountDownLatch(iterations);
final CountDownLatch tasksCompletedCountDown = new CountDownLatch(iterations);
final List<Runnable> actions = new ArrayList<>(iterations);
final Function<Priority, Runnable> rerouteFromPriority = priority -> () -> {
final AtomicBoolean alreadyRun = new AtomicBoolean();
batchedRerouteService.reroute("reroute at " + priority, priority, ActionListener.wrap(() -> {
assertTrue(alreadyRun.compareAndSet(false, true));
tasksCompletedCountDown.countDown();
}));
try (ThreadContext.StoredContext ignored = threadContext.stashContext()) {
final String contextValue = randomAlphaOfLength(10);
threadContext.putHeader(contextHeader, contextValue);
batchedRerouteService.reroute("reroute at " + priority, priority, ActionListener.wrap(() -> {
assertTrue(alreadyRun.compareAndSet(false, true));
assertThat(threadContext.getHeader(contextHeader), equalTo(contextValue));
tasksCompletedCountDown.countDown();
}));
}
tasksSubmittedCountDown.countDown();
};
actions.add(rerouteFromPriority.apply(Priority.URGENT)); // ensure at least one URGENT priority reroute
Expand Down