This is an automated email from the ASF dual-hosted git repository.
yong 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 83ec4a964 fix logger number not correct (#3211)
83ec4a964 is described below
commit 83ec4a964e2447ce1a36b7087a9cf0bec10457cb
Author: ZhangJian He <[email protected]>
AuthorDate: Fri Apr 22 09:00:01 2022 +0800
fix logger number not correct (#3211)
### Motivation
fix logger number not correct
### Changes
fix logger number not correct
---
.../java/org/apache/bookkeeper/common/util/TestThreadSelection.java | 3 ++-
.../bookkeeper/bookie/datainteg/DataIntegrityCookieValidation.java | 2 +-
.../src/main/java/org/apache/bookkeeper/proto/AuthHandler.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestThreadSelection.java
b/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestThreadSelection.java
index 5f4b6fc4e..9991b3f3a 100644
---
a/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestThreadSelection.java
+++
b/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestThreadSelection.java
@@ -118,7 +118,8 @@ public class TestThreadSelection {
private void validateTest(long[] placement, int numThreads) {
long min = Longs.min(placement);
long max = Longs.max(placement);
- log.info("got min={}, max={} (disparity: {}) for {} threads with {}
ids", min, max, numThreads, MAX_KEY);
+ log.info("got min={}, max={} (disparity: {}) for {} threads with {}
ids",
+ min, max, max - min, numThreads, MAX_KEY);
Assert.assertTrue("all threads were used [numThreads: " + numThreads +
"]",
min > 0);
log.info("disparity = {}", String.format("%,.2f", (double) max / min));
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/datainteg/DataIntegrityCookieValidation.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/datainteg/DataIntegrityCookieValidation.java
index 75ce5b13c..add301dd1 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/datainteg/DataIntegrityCookieValidation.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/datainteg/DataIntegrityCookieValidation.java
@@ -96,7 +96,7 @@ public class DataIntegrityCookieValidation implements
CookieValidation {
log.info("Stamping cookie to directory {}", d);
masterCookie.writeToDirectory(d);
} catch (IOException ioe) {
- log.error("Exception writing cookie to {}", ioe);
+ log.error("Exception writing cookie", ioe);
throw new BookieException.InvalidCookieException(ioe);
}
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java
index e05846e06..ecc95f598 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java
@@ -150,8 +150,8 @@ class AuthHandler {
private boolean checkAuthPlugin(AuthMessage am, final Channel src) {
if (!am.hasAuthPluginName() ||
!am.getAuthPluginName().equals(authProviderFactory.getPluginName())) {
- LOG.error("Received message from incompatible auth plugin.
Local = {}," + " Remote = {}, Channel = {}",
- authProviderFactory.getPluginName(),
am.getAuthPluginName());
+ LOG.error("Received message from incompatible auth plugin.
Local = {}, Remote = {}, Channel = {}",
+ authProviderFactory.getPluginName(),
am.getAuthPluginName(), src);
return false;
}
return true;