Skip to content

FLUME-3320 Fix taildir source reset position bug #368

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

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

FLUME-3320 Fix taildir source reset position bug #368

Show file tree
Hide file tree
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
21 changes: 13 additions & 8 deletions ...ldir-source/src/main/java/org/apache/flume/source/taildir/ReliableTaildirEventReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.attribute.FileTime;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -243,24 +244,29 @@ public List<Long> updateTailFiles(boolean skipToEnd) throws IOException {
Map<String, String> headers = headerTable.row(taildir.getFileGroup());

for (File f : taildir.getMatchingFiles()) {
long inode;
Map<String, Object> attrs;
try {
inode = getInode(f);
attrs = getFileAttrs(f);
} catch (NoSuchFileException e) {
logger.info("File has been deleted in the meantime: " + e.getMessage());
continue;
}
long inode = (long) attrs.get("ino");
long fileSize = (long) attrs.get("size");
long mtime = ((FileTime) attrs.get("lastModifiedTime")).toMillis();

TailFile tf = tailFiles.get(inode);
if (tf == null || !tf.getPath().equals(f.getAbsolutePath())) {
long startPos = skipToEnd ? f.length() : 0;
long startPos = skipToEnd ? fileSize : 0;
tf = openFile(f, headers, inode, startPos);
} else {
boolean updated = tf.getLastUpdated() < f.lastModified() || tf.getPos() != f.length();
boolean updated = tf.getLastUpdated() < mtime || tf.getPos() != fileSize;
if (updated) {
if (tf.getRaf() == null) {
tf = openFile(f, headers, inode, tf.getPos());
}
if (f.length() < tf.getPos()) {
// The file was replaced or rewritten for some reason.
if (fileSize < tf.getPos()) {
logger.info("Pos " + tf.getPos() + " is larger than file size! "
+ "Restarting from pos 0, file: " + tf.getPath() + ", inode: " + inode);
tf.updatePos(tf.getPath(), inode, 0);
Expand All @@ -280,9 +286,8 @@ public List<Long> updateTailFiles() throws IOException {
}


private long getInode(File file) throws IOException {
long inode = (long) Files.getAttribute(file.toPath(), "unix:ino");
return inode;
private Map<String, Object> getFileAttrs(File file) throws IOException {
return Files.readAttributes(file.toPath(), "unix:ino,size,lastModifiedTime");
}

private TailFile openFile(File file, Map<String, String> headers, long inode, long pos) {
Expand Down
7 changes: 7 additions & 0 deletions ...-sources/flume-taildir-source/src/main/java/org/apache/flume/source/taildir/TailFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.file.Files;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -69,6 +70,12 @@ public TailFile(File file, Map<String, String> headers, long inode, long pos)
this.headers = headers;
this.oldBuffer = new byte[0];
this.bufferPos = NEED_READING;

long newInode = (long) Files.getAttribute(file.toPath(), "unix:ino");
if (inode != newInode) {
logger.info("Detected the inode change. The New inode file is tailed next time. " +
"file: " + path + ", inode: " + newInode);
}
}

public RandomAccessFile getRaf() {
Expand Down