Skip to content

Fix clean up of old entries in DatabaseRegistry.initialize #70135

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
probakowski merged 4 commits into from
Mar 9, 2021
Merged

Fix clean up of old entries in DatabaseRegistry.initialize #70135

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
403e048
Clean up databases after geoip integration tests
probakowski Mar 9, 2021
f0c6c93
fix cleanup in DatabaseRegistry
probakowski Mar 9, 2021
012391b
NSF is safe to skip
probakowski Mar 9, 2021
52cfd97
whitespaces
probakowski Mar 9, 2021
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
48 changes: 35 additions & 13 deletions modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/DatabaseRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,15 @@

import java.io.Closeable;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.FileVisitResult;
import java.nio.file.FileVisitor;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
import java.nio.file.attribute.BasicFileAttributes;
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -104,18 +107,37 @@ final class DatabaseRegistry implements Closeable {

public void initialize(ResourceWatcherService resourceWatcher, IngestService ingestService) throws IOException {
localDatabases.initialize(resourceWatcher);
if (Files.exists(geoipTmpDirectory)) {
Files.walk(geoipTmpDirectory)
.filter(Files::isRegularFile)
.peek(path -> LOGGER.info("deleting stale file [{}]", path))
.forEach(path -> {
try {
Files.delete(path);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
});
} else {
Files.walkFileTree(geoipTmpDirectory, new FileVisitor<>() {
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
return FileVisitResult.CONTINUE;
}

@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
try {
LOGGER.info("deleting stale file [{}]", file);
Files.deleteIfExists(file);
} catch (IOException e) {
LOGGER.warn("can't delete stale file [" + file + "]", e);
}
return FileVisitResult.CONTINUE;
}

@Override
public FileVisitResult visitFileFailed(Path file, IOException e) {
if(e instanceof NoSuchFileException == false) {
LOGGER.warn("can't delete stale file [" + file + "]", e);
}
return FileVisitResult.CONTINUE;
}

@Override
public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
return FileVisitResult.CONTINUE;
}
});
if (Files.exists(geoipTmpDirectory) == false) {
Files.createDirectory(geoipTmpDirectory);
}
LOGGER.info("initialized database registry, using geoip-databases directory [{}]", geoipTmpDirectory);
Expand Down