Skip to content

Commit aba69d0

Browse files
Fix InternalEngineTests
1 parent 26e4043 commit aba69d0

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.index.engine;
1111

1212
import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
13-
1413
import org.apache.logging.log4j.Level;
1514
import org.apache.logging.log4j.LogManager;
1615
import org.apache.logging.log4j.Logger;
@@ -2578,10 +2577,10 @@ public boolean mergeCompleted() {
25782577
public void append(LogEvent event) {
25792578
final String formattedMessage = event.getMessage().getFormattedMessage();
25802579
if (event.getLevel() == Level.TRACE && event.getMarker().getName().contains("[index][0]")) {
2581-
if (formattedMessage.startsWith("merge thread")) {
2580+
if (formattedMessage.startsWith("merge task")) {
25822581
messages.add(formattedMessage);
25832582
} else if (event.getLoggerName().endsWith(".MS")
2584-
&& formattedMessage.contains("MS: merge thread")
2583+
&& formattedMessage.contains("MS: merge task")
25852584
&& formattedMessage.endsWith("end")) {
25862585
luceneMergeSchedulerEnded.set(true);
25872586
}
@@ -2616,14 +2615,14 @@ public void testMergeThreadLogging() throws Exception {
26162615
});
26172616

26182617
assertBusy(() -> {
2619-
List<String> threadMsgs = mockAppender.messages().stream().filter(line -> line.startsWith("merge thread")).toList();
2618+
List<String> threadMsgs = mockAppender.messages().stream().filter(line -> line.startsWith("merge task")).toList();
26202619
assertThat("messages:" + threadMsgs, threadMsgs.size(), greaterThanOrEqualTo(3));
26212620
assertThat(
26222621
threadMsgs,
26232622
containsInRelativeOrder(
2624-
matchesRegex("^merge thread .* start$"),
2625-
matchesRegex("^merge thread .* merge segment.*$"),
2626-
matchesRegex("^merge thread .* end$")
2623+
matchesRegex("^merge task .* start$"),
2624+
matchesRegex("^merge task .* merge segment.*$"),
2625+
matchesRegex("^merge task .* end$")
26272626
)
26282627
);
26292628
assertThat(mockAppender.mergeCompleted(), is(true));

0 commit comments

Comments
 (0)