root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

KAFKA-17310 locking the offline dir can destroy the broker exceptionally (#16856) 

Reviewers: Chia-Ping Tsai <chia7712@gmail.com>
This commit is contained in:
Kuan-Po Tseng 2024-08-12 16:44:18 +08:00 committed by GitHub
parent bbdf79e1b4
commit 5d115fea3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
server-common/src/main/java/org/apache/kafka/server/util/FileLock.java
View File

@ -37,14 +37,10 @@ public class FileLock {
private final FileChannel channel;
private java.nio.channels.FileLock flock;
public FileLock(File file) {
public FileLock(File file) throws IOException {
this.file = file;
try {
this.channel = FileChannel.open(file.toPath(), StandardOpenOption.CREATE, StandardOpenOption.READ,
StandardOpenOption.WRITE);
} catch (IOException e) {
throw new RuntimeException(e);
}
this.channel = FileChannel.open(file.toPath(), StandardOpenOption.CREATE, StandardOpenOption.READ,
StandardOpenOption.WRITE);
}
public File file() {
@ -54,19 +50,15 @@ public class FileLock {
/**
* Lock the file or throw an exception if the lock is already held
*/
public synchronized void lock() {
public synchronized void lock() throws IOException {
LOGGER.trace("Acquiring lock on {}", file.getAbsolutePath());
try {
flock = channel.lock();
} catch (IOException e) {
throw new RuntimeException(e);
}
flock = channel.lock();
}
/**
* Try to lock the file and return true if the locking succeeds
*/
public synchronized boolean tryLock() {
public synchronized boolean tryLock() throws IOException {
LOGGER.trace("Acquiring lock on {}", file.getAbsolutePath());
try {
// weirdly this method will return null if the lock is held by another
@ -76,37 +68,27 @@ public class FileLock {
return flock != null;
} catch (OverlappingFileLockException e) {
return false;
} catch (IOException e) {
throw new RuntimeException(e);
}
}
/**
* Unlock the lock if it is held
*/
public synchronized void unlock() {
public synchronized void unlock() throws IOException {
LOGGER.trace("Releasing lock on {}", file.getAbsolutePath());
if (flock != null) {
try {
flock.release();
} catch (IOException e) {
throw new RuntimeException(e);
}
flock.release();
}
}
/**
* Destroy this lock, closing the associated FileChannel
*/
public synchronized void destroy() {
public synchronized void destroy() throws IOException {
unlock();
try {
if (file.exists() && file.delete()) {
LOGGER.trace("Deleted {}", file.getAbsolutePath());
}
channel.close();
} catch (IOException e) {
throw new RuntimeException(e);
if (file.exists() && file.delete()) {
LOGGER.trace("Deleted {}", file.getAbsolutePath());
}
channel.close();
}
}

5
shell/src/main/java/org/apache/kafka/shell/MetadataShell.java
View File

@ -41,6 +41,7 @@ import org.slf4j.LoggerFactory;
import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
@ -107,7 +108,7 @@ public final class MetadataShell {
* this hole would require the parent directory to always be writable when loading a
* snapshot so that we could create our .lock file there.
*/
static FileLock takeDirectoryLockIfExists(File directory) {
static FileLock takeDirectoryLockIfExists(File directory) throws IOException {
if (new File(directory, ".lock").exists()) {
return takeDirectoryLock(directory);
} else {
@ -118,7 +119,7 @@ public final class MetadataShell {
/**
* Take the FileLock in the given directory.
*/
static FileLock takeDirectoryLock(File directory) {
static FileLock takeDirectoryLock(File directory) throws IOException {
FileLock fileLock = new FileLock(new File(directory, ".lock"));
try {
if (!fileLock.tryLock()) {