|
10 | 10 | package org.elasticsearch.index.engine; |
11 | 11 |
|
12 | 12 | import com.carrotsearch.randomizedtesting.generators.RandomNumbers; |
13 | | - |
14 | 13 | import org.apache.logging.log4j.Level; |
15 | 14 | import org.apache.logging.log4j.LogManager; |
16 | 15 | import org.apache.logging.log4j.Logger; |
@@ -2578,10 +2577,10 @@ public boolean mergeCompleted() { |
2578 | 2577 | public void append(LogEvent event) { |
2579 | 2578 | final String formattedMessage = event.getMessage().getFormattedMessage(); |
2580 | 2579 | if (event.getLevel() == Level.TRACE && event.getMarker().getName().contains("[index][0]")) { |
2581 | | - if (formattedMessage.startsWith("merge thread")) { |
| 2580 | + if (formattedMessage.startsWith("merge task")) { |
2582 | 2581 | messages.add(formattedMessage); |
2583 | 2582 | } else if (event.getLoggerName().endsWith(".MS") |
2584 | | - && formattedMessage.contains("MS: merge thread") |
| 2583 | + && formattedMessage.contains("MS: merge task") |
2585 | 2584 | && formattedMessage.endsWith("end")) { |
2586 | 2585 | luceneMergeSchedulerEnded.set(true); |
2587 | 2586 | } |
@@ -2616,14 +2615,14 @@ public void testMergeThreadLogging() throws Exception { |
2616 | 2615 | }); |
2617 | 2616 |
|
2618 | 2617 | 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(); |
2620 | 2619 | assertThat("messages:" + threadMsgs, threadMsgs.size(), greaterThanOrEqualTo(3)); |
2621 | 2620 | assertThat( |
2622 | 2621 | threadMsgs, |
2623 | 2622 | 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$") |
2627 | 2626 | ) |
2628 | 2627 | ); |
2629 | 2628 | assertThat(mockAppender.mergeCompleted(), is(true)); |
|
0 commit comments