Skip to content

Commit fc600ac

Browse files
committed
Dial back the level of detail validated for the segments that are deleted
Signed-off-by: Peter Nied <petern@amazon.com>
1 parent 0dd44f7 commit fc600ac

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java

-15
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import java.util.concurrent.CountDownLatch;
6262
import java.util.concurrent.ExecutorService;
6363
import java.util.concurrent.TimeUnit;
64-
import java.util.regex.Pattern;
6564
import java.util.stream.Collectors;
6665

6766
import org.mockito.Mockito;
@@ -995,20 +994,6 @@ public void testDeleteStaleCommitsActualDelete() throws Exception {
995994
.map(metadata -> metadata.split(RemoteSegmentStoreDirectory.UploadedSegmentMetadata.SEPARATOR)[1])
996995
.collect(Collectors.toList());
997996

998-
final String allFilesPattern = filesToBeDeleted.stream()
999-
.map(Pattern::quote) // Make sure filenames are matched literally
1000-
.map(file -> "(?=.*?" + file + ")") // Allow for matches in any order
1001-
.collect(Collectors.joining("", "deletedSegmentFiles=\\[", ".*\\]"));
1002-
1003-
appender.addExpectation(
1004-
new MockLogAppender.PatternSeenWithLoggerPrefixExpectation(
1005-
"Deleted file segments message",
1006-
"org.opensearch.index.store.RemoteSegmentStoreDirectory",
1007-
Level.DEBUG,
1008-
allFilesPattern
1009-
)
1010-
);
1011-
1012997
remoteSegmentStoreDirectory.init();
1013998

1014999
// popluateMetadata() adds stub to return 3 metadata files

test/framework/src/main/java/org/opensearch/test/MockLogAppender.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,7 @@ public void match(final LogEvent event) {
305305
public void assertMatched() {
306306
if (!eventSeen.get()) {
307307
final StringBuilder failureMessage = new StringBuilder();
308-
failureMessage.append(
309-
String.format("%s was not seen, found %d messages matching the logger.", expectationName, loggerMatches.size())
310-
);
308+
failureMessage.append(expectationName + " was not seen, found " + loggerMatches.size() + " messages matching the logger.");
311309
failureMessage.append("\r\nMessage matching regex: " + messageMatchingRegex);
312310
if (!loggerMatches.isEmpty()) {
313311
failureMessage.append("\r\nMessage details:\r\n" + String.join("\r\n", loggerMatches));

0 commit comments

Comments
 (0)