This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch 3.9
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/3.9 by this push:
new fccae405649 KAFKA-17310 locking the offline dir can destroy the broker
exceptionally (#16856)
fccae405649 is described below
commit fccae40564910bfb64bd5f32ecba338538387129
Author: Kuan-Po Tseng <[email protected]>
AuthorDate: Mon Aug 12 16:44:18 2024 +0800
KAFKA-17310 locking the offline dir can destroy the broker exceptionally
(#16856)
Reviewers: Chia-Ping Tsai <[email protected]>
---
.../org/apache/kafka/server/util/FileLock.java | 42 +++++++---------------
.../java/org/apache/kafka/shell/MetadataShell.java | 5 +--
2 files changed, 15 insertions(+), 32 deletions(-)
diff --git
a/server-common/src/main/java/org/apache/kafka/server/util/FileLock.java
b/server-common/src/main/java/org/apache/kafka/server/util/FileLock.java
index 00d537c6af7..4f55b4aebcd 100644
--- a/server-common/src/main/java/org/apache/kafka/server/util/FileLock.java
+++ b/server-common/src/main/java/org/apache/kafka/server/util/FileLock.java
@@ -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();
}
}
diff --git a/shell/src/main/java/org/apache/kafka/shell/MetadataShell.java
b/shell/src/main/java/org/apache/kafka/shell/MetadataShell.java
index b3b9979534e..0242e349835 100644
--- a/shell/src/main/java/org/apache/kafka/shell/MetadataShell.java
+++ b/shell/src/main/java/org/apache/kafka/shell/MetadataShell.java
@@ -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()) {
