This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 034ef85 Fix logger member not correct; (#2605)
034ef85 is described below
commit 034ef8566ad037937a4d58a28f70631175744f53
Author: Shoothzj <[email protected]>
AuthorDate: Sun May 9 02:35:31 2021 +0800
Fix logger member not correct; (#2605)
Fix java doc problem
Co-authored-by: shoothzj <[email protected]>
---
.../apache/bookkeeper/bookie/BufferedChannel.java | 21 ++++++++++++++++-----
.../bookie/EntryLogManagerForSingleEntryLog.java | 2 +-
.../org/apache/bookkeeper/bookie/EntryLogger.java | 2 +-
.../apache/bookkeeper/bookie/IndexInMemPageMgr.java | 2 +-
.../client/DefaultBookieAddressResolver.java | 2 +-
.../bookkeeper/client/LedgerFragmentReplicator.java | 2 +-
.../RackawareEnsemblePlacementPolicyImpl.java | 4 ++--
.../bookkeeper/discover/ZKRegistrationClient.java | 4 ++--
.../apache/bookkeeper/proto/BookieNettyServer.java | 4 ++--
.../bookkeeper/proto/BookieRequestProcessor.java | 2 +-
.../bookkeeper/proto/PerChannelBookieClient.java | 3 +--
.../org/apache/bookkeeper/util/EventLoopUtil.java | 4 ++--
12 files changed, 31 insertions(+), 21 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java
index a5c1ad7..faf0112 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java
@@ -35,13 +35,21 @@ import java.util.concurrent.atomic.AtomicLong;
* Provides a buffering layer in front of a FileChannel.
*/
public class BufferedChannel extends BufferedReadChannel implements Closeable {
- // The capacity of the write buffer.
+ /**
+ * The capacity of the write buffer.
+ */
protected final int writeCapacity;
- // The position of the file channel's write pointer.
+ /**
+ * The position of the file channel's write pointer.
+ */
protected AtomicLong writeBufferStartPosition = new AtomicLong(0);
- // The buffer used to write operations.
+ /**
+ * The buffer used to write operations.
+ */
protected final ByteBuf writeBuffer;
- // The absolute position of the next write operation.
+ /**
+ * The absolute position of the next write operation.
+ */
protected volatile long position;
/*
@@ -197,8 +205,11 @@ public class BufferedChannel extends BufferedReadChannel
implements Closeable {
writeBufferStartPosition.set(fileChannel.position());
}
- /*
+ /**
* force a sync operation so that data is persisted to the disk.
+ * @param forceMetadata
+ * @return
+ * @throws IOException
*/
public long forceWrite(boolean forceMetadata) throws IOException {
// This is the point up to which we had flushed to the file system
page cache
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java
index 72c818a..f5b8823 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogManagerForSingleEntryLog.java
@@ -44,7 +44,7 @@ class EntryLogManagerForSingleEntryLog extends
EntryLogManagerBase {
private volatile BufferedLogChannel activeLogChannel;
private long logIdBeforeFlush = INVALID_LID;
private final AtomicBoolean shouldCreateNewEntryLog = new
AtomicBoolean(false);
- private EntryLogger.RecentEntryLogsStatus recentlyCreatedEntryLogsStatus;
+ private final EntryLogger.RecentEntryLogsStatus
recentlyCreatedEntryLogsStatus;
EntryLogManagerForSingleEntryLog(ServerConfiguration conf,
LedgerDirsManager ledgerDirsManager,
EntryLoggerAllocator entryLoggerAllocator,
List<EntryLogger.EntryLogListener> listeners,
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
index 062432a..d612e53 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
@@ -814,7 +814,7 @@ public class EntryLogger {
}
public ByteBuf internalReadEntry(long ledgerId, long entryId, long
location, boolean validateEntry)
- throws IOException, Bookie.NoEntryException {
+ throws IOException {
long entryLogId = logIdForOffset(location);
long pos = posForOffset(location);
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/IndexInMemPageMgr.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/IndexInMemPageMgr.java
index 9abc7b6..2a36020 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/IndexInMemPageMgr.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/IndexInMemPageMgr.java
@@ -394,7 +394,7 @@ class IndexInMemPageMgr {
return pageCount.get();
}
- /**
+ /**
* Get the ledger entry page for a given <i>pageEntry</i>.
*
* @param ledger
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultBookieAddressResolver.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultBookieAddressResolver.java
index b9d51ab..51aead7 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultBookieAddressResolver.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultBookieAddressResolver.java
@@ -59,7 +59,7 @@ public class DefaultBookieAddressResolver implements
BookieAddressResolver {
log.debug("Resolving dummy bookie Id {} using legacy bookie
resolver", bookieId);
return BookieSocketAddress.resolveDummyBookieId(bookieId);
}
- log.info("Cannot resolve {}, bookie is unknown", bookieId,
ex.toString());
+ log.info("Cannot resolve {}, bookie is unknown {}", bookieId,
ex.toString());
throw new BookieIdNotResolvedException(bookieId, ex);
} catch (Exception ex) {
if (ex instanceof InterruptedException) {
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java
index b2c1933..cd8b508 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java
@@ -437,7 +437,7 @@ public class LedgerFragmentReplicator {
updateLoop.run().whenComplete((result, ex) -> {
if (ex == null) {
- LOG.info("Updated ZK for ledgerId: ({}:{}) to point ledger
fragments"
+ LOG.info("Updated ZK to point ledger fragments"
+ " from old bookies to new bookies: {}",
oldBookie2NewBookie);
ensembleUpdatedCb.processResult(BKException.Code.OK, null,
null);
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
index 8ee3f69..679aec3 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
@@ -269,9 +269,9 @@ public class RackawareEnsemblePlacementPolicyImpl extends
TopologyAwareEnsembleP
}
} catch (RuntimeException re) {
if (!conf.getEnforceMinNumRacksPerWriteQuorum()) {
- LOG.error("Failed to initialize DNS Resolver {}, used
default subnet resolver : {}",
+ LOG.error("Failed to initialize DNS Resolver {}, used
default subnet resolver : {} {}",
dnsResolverName, re, re.getMessage());
- dnsResolver = new DefaultResolver(() ->
this.getDefaultRack());
+ dnsResolver = new DefaultResolver(this::getDefaultRack);
} else {
/*
* if minNumRacksPerWriteQuorum is enforced, then it
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/discover/ZKRegistrationClient.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/discover/ZKRegistrationClient.java
index d455cb9..ee4f3e9 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/discover/ZKRegistrationClient.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/discover/ZKRegistrationClient.java
@@ -271,7 +271,7 @@ public class ZKRegistrationClient implements
RegistrationClient {
bookieServiceInfoCache.put(bookieId, result);
promise.complete(result);
} catch (IOException ex) {
- log.error("Cannot update BookieInfo for {}", ex);
+ log.error("Cannot update BookieInfo for ", ex);
promise.completeExceptionally(KeeperException.create(KeeperException.Code.get(rc),
path)
.initCause(ex));
return;
@@ -289,7 +289,7 @@ public class ZKRegistrationClient implements
RegistrationClient {
bookieServiceInfoCache.put(bookieId, result);
promise.complete(result);
} catch (IOException ex) {
- log.error("Cannot update BookieInfo for {}", ex);
+ log.error("Cannot update BookieInfo for ", ex);
promise.completeExceptionally(KeeperException.create(KeeperException.Code.get(rc2),
path2)
.initCause(ex));
return;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
index 90efed7..93a93ba 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
@@ -152,8 +152,8 @@ class BookieNettyServer {
try {
CpuAffinity.acquireCore();
} catch (Throwable t) {
- LOG.warn("Failed to acquire CPU core for thread
{}", Thread.currentThread().getName(),
- t.getMessage(), t);
+ LOG.warn("Failed to acquire CPU core for thread {}
{}",
+ Thread.currentThread().getName(),
t.getMessage(), t);
}
});
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java
index 3397b19..67f83e9 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java
@@ -578,7 +578,7 @@ public class BookieRequestProcessor implements
RequestProcessor {
if (future.isSuccess()) {
LOG.error("TLS Handshake failed: Could not
authenticate.");
} else {
- LOG.error("TLS Handshake failure: {} ",
future.cause());
+ LOG.error("TLS Handshake failure: ",
future.cause());
}
BookkeeperProtocol.Response.Builder errResponse =
BookkeeperProtocol.Response.newBuilder()
.setHeader(r.getHeader()).setStatus(BookkeeperProtocol.StatusCode.EIO);
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
index 279497e..f248a40 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
@@ -505,7 +505,6 @@ public class PerChannelBookieClient extends
ChannelInboundHandlerAdapter {
}
private void completeOperation(GenericCallback<PerChannelBookieClient> op,
int rc) {
- //Thread.dumpStack();
closeLock.readLock().lock();
try {
if (ConnectionState.CLOSED == state) {
@@ -531,7 +530,7 @@ public class PerChannelBookieClient extends
ChannelInboundHandlerAdapter {
try {
addr = bookieAddressResolver.resolve(bookieId);
} catch (BookieAddressResolver.BookieIdNotResolvedException err) {
- LOG.error("Cannot connect to {} as endpoint resolution failed
(probably bookie is down)",
+ LOG.error("Cannot connect to {} as endpoint resolution failed
(probably bookie is down) err {}",
bookieId, err.toString());
return processBookieNotResolvedError(startTime, err);
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EventLoopUtil.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EventLoopUtil.java
index 32cb228..c1349fd 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EventLoopUtil.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EventLoopUtil.java
@@ -70,8 +70,8 @@ public class EventLoopUtil {
try {
CpuAffinity.acquireCore();
} catch (Throwable t) {
- log.warn("Failed to acquire CPU core for thread {}",
Thread.currentThread().getName(),
- t.getMessage(), t);
+ log.warn("Failed to acquire CPU core for thread {} err
{} {}",
+ Thread.currentThread().getName(),
t.getMessage(), t);
}
});
}
