Skip to content

Avoid multiline check-index log messages #74303

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
Jun 18, 2021
Merged

Avoid multiline check-index log messages #74303

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
35 changes: 23 additions & 12 deletions server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2575,8 +2575,6 @@ private void doCheckIndex() throws IOException {
if (Lucene.indexExists(store.directory()) == false) {
return;
}
BytesStreamOutput os = new BytesStreamOutput();
PrintStream out = new PrintStream(os, false, StandardCharsets.UTF_8.name());

if ("checksum".equals(checkIndexOnStartup)) {
// physical verification only: verify all checksums for the latest commit
Expand All @@ -2588,23 +2586,36 @@ private void doCheckIndex() throws IOException {
logger.warn("check index [failure]", e);
throw e;
}
final List<String> checkedFiles = new ArrayList<>(metadata.size());
for (Map.Entry<String, StoreFileMetadata> entry : metadata.asMap().entrySet()) {
try {
Store.checkIntegrity(entry.getValue(), store.directory());
out.println("checksum passed: " + entry.getKey());
} catch (IOException exc) {
out.println("checksum failed: " + entry.getKey());
exc.printStackTrace(out);
corrupt = exc;
if (corrupt == null) {
checkedFiles.add(entry.getKey());
} else {
logger.info("check index [ok]: checksum check passed on [{}]", entry.getKey());
}
} catch (IOException ioException) {
for (final String checkedFile : checkedFiles) {
logger.info("check index [ok]: checksum check passed on [{}]", checkedFile);
}
checkedFiles.clear();
logger.warn(new ParameterizedMessage("check index [failure]: checksum failed on [{}]", entry.getKey()), ioException);
corrupt = ioException;
}
}
out.flush();
if (corrupt != null) {
logger.warn("check index [failure]\n{}", os.bytes().utf8ToString());
throw corrupt;
}
if (logger.isDebugEnabled()) {
for (final String checkedFile : checkedFiles) {
logger.debug("check index [ok]: checksum check passed on [{}]", checkedFile);
}
}
} else {
// full checkindex
final BytesStreamOutput os = new BytesStreamOutput();
final PrintStream out = new PrintStream(os, false, StandardCharsets.UTF_8.name());
final CheckIndex.Status status = store.checkIndex(out);
out.flush();
if (status.clean == false) {
Expand All @@ -2617,10 +2628,10 @@ private void doCheckIndex() throws IOException {
logger.warn("{}", os.bytes().utf8ToString());
throw new IOException("index check failure");
}
}

if (logger.isDebugEnabled()) {
logger.debug("check index [success]\n{}", os.bytes().utf8ToString());
if (logger.isDebugEnabled()) {
logger.debug("check index [success]\n{}", os.bytes().utf8ToString());
}
}

recoveryState.getVerifyIndex().checkIndexTime(Math.max(0, TimeValue.nsecToMSec(System.nanoTime() - timeNS)));
Expand Down