[bookkeeper] branch branch-4.14 updated: [Branch-4.14] cherry-pick pr #3623 (#3634)

[chenhang]

This is an automated email from the ASF dual-hosted git repository.

chenhang pushed a commit to branch branch-4.14
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/branch-4.14 by this push:
     new 03947ad20d [Branch-4.14] cherry-pick pr #3623 (#3634)
03947ad20d is described below

commit 03947ad20ddfcebc0d5dce195f1166ad617d8190
Author: Hang Chen <chenh...@apache.org>
AuthorDate: Wed Nov 16 10:40:40 2022 +0800

    [Branch-4.14] cherry-pick pr #3623 (#3634)
    
    ### Motivation
    https://github.com/apache/bookkeeper/pull/3623 is hard to be cherry-picked 
to branch-4.14, push another PR for it.
    
    ### Changes
    cherry-pick PR https://github.com/apache/bookkeeper/pull/3623 to branch-4.14
---
 .../src/main/java/org/apache/bookkeeper/bookie/Bookie.java             | 3 ++-
 .../bookkeeper/tools/cli/commands/bookie/ReadLogMetadataCommand.java   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
index 0c5af7f6f0..3b0529045b 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
@@ -980,7 +980,8 @@ public class Bookie extends BookieCriticalThread {
         // validate filtered log ids only when we have markedLogId
         if (markedLog.getLogFileId() > 0) {
             if (logs.size() == 0 || logs.get(0) != markedLog.getLogFileId()) {
-                throw new IOException("Recovery log " + 
markedLog.getLogFileId() + " is missing");
+                String path = journal.getJournalDirectory().getAbsolutePath();
+                throw new IOException("Recovery log " + 
markedLog.getLogFileId() + " is missing at " + path);
             }
         }
 
diff --git 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLogMetadataCommand.java
 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLogMetadataCommand.java
index b22338d2e8..987015cfca 100644
--- 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLogMetadataCommand.java
+++ 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLogMetadataCommand.java
@@ -20,6 +20,7 @@ package org.apache.bookkeeper.tools.cli.commands.bookie;
 
 import com.beust.jcommander.Parameter;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.File;
 import java.io.IOException;
 import lombok.Setter;
@@ -139,6 +140,7 @@ public class ReadLogMetadataCommand extends 
BookieCommand<ReadLogMetadataFlags>
         });
     }
 
+    @SuppressFBWarnings("IS2_INCONSISTENT_SYNC")
     private synchronized void initEntryLogger(ServerConfiguration conf) throws 
IOException {
         // provide read only entry logger
         if (null == entryLogger) {