You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2018/01/17 15:04:09 UTC
[GitHub] jiazhai closed pull request #977: LedgerHandle: add counters to track ledger->bookie counts
jiazhai closed pull request #977: LedgerHandle: add counters to track ledger->bookie counts
URL: https://github.com/apache/bookkeeper/pull/977
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
index f07986d2d..a58b50143 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
@@ -782,7 +782,7 @@ public void asyncCreateLedger(final int ensSize, final int writeQuorumSize, fina
}
new LedgerCreateOp(BookKeeper.this, ensSize, writeQuorumSize,
ackQuorumSize, digestType, passwd, cb, ctx,
- customMetadata, EnumSet.noneOf(WriteFlag.class))
+ customMetadata, EnumSet.noneOf(WriteFlag.class), getStatsLogger())
.initiate();
} finally {
closeLock.readLock().unlock();
@@ -986,7 +986,7 @@ public void asyncCreateLedgerAdv(final int ensSize, final int writeQuorumSize, f
}
new LedgerCreateOp(BookKeeper.this, ensSize, writeQuorumSize,
ackQuorumSize, digestType, passwd, cb, ctx,
- customMetadata, EnumSet.noneOf(WriteFlag.class))
+ customMetadata, EnumSet.noneOf(WriteFlag.class), getStatsLogger())
.initiateAdv(-1L);
} finally {
closeLock.readLock().unlock();
@@ -1097,7 +1097,7 @@ public void asyncCreateLedgerAdv(final long ledgerId,
}
new LedgerCreateOp(BookKeeper.this, ensSize, writeQuorumSize,
ackQuorumSize, digestType, passwd, cb, ctx,
- customMetadata, EnumSet.noneOf(WriteFlag.class))
+ customMetadata, EnumSet.noneOf(WriteFlag.class), getStatsLogger())
.initiateAdv(ledgerId);
} finally {
closeLock.readLock().unlock();
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperClientStats.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperClientStats.java
index 02947a4bb..8822b9309 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperClientStats.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperClientStats.java
@@ -35,6 +35,7 @@
String RECOVER_OP = "LEDGER_RECOVER";
String LEDGER_RECOVER_READ_ENTRIES = "LEDGER_RECOVER_READ_ENTRIES";
String LEDGER_RECOVER_ADD_ENTRIES = "LEDGER_RECOVER_ADD_ENTRIES";
+ String LEDGER_ENSEMBLE_BOOKIE_DISTRIBUTION = "LEDGER_ENSEMBLE_BOOKIE_DISTRIBUTION";
// Data Operations
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerCreateOp.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerCreateOp.java
index a3d523901..aa6cd69d0 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerCreateOp.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerCreateOp.java
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
@@ -44,6 +45,7 @@
import org.apache.bookkeeper.net.BookieSocketAddress;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GenericCallback;
import org.apache.bookkeeper.stats.OpStatsLogger;
+import org.apache.bookkeeper.stats.StatsLogger;
import org.apache.bookkeeper.util.MathUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,6 +71,7 @@
final OpStatsLogger createOpLogger;
boolean adv = false;
boolean generateLedgerId = true;
+ private final StatsLogger statsLogger;
/**
* Constructor.
@@ -93,9 +96,11 @@
* A map of user specified custom metadata about the ledger to be persisted; will not try to
* preserve the order(e.g. sortedMap) upon later retireval.
*/
- LedgerCreateOp(BookKeeper bk, int ensembleSize, int writeQuorumSize, int ackQuorumSize, DigestType digestType,
+ LedgerCreateOp(
+ BookKeeper bk, int ensembleSize, int writeQuorumSize, int ackQuorumSize, DigestType digestType,
byte[] passwd, CreateCallback cb, Object ctx, final Map<String, byte[]> customMetadata,
- EnumSet<WriteFlag> writeFlags) {
+ EnumSet<WriteFlag> writeFlags,
+ StatsLogger statsLogger) {
this.bk = bk;
this.metadata = new LedgerMetadata(
ensembleSize,
@@ -112,6 +117,7 @@
this.ctx = ctx;
this.startTime = MathUtils.nowInNano();
this.createOpLogger = bk.getCreateOpLogger();
+ this.statsLogger = statsLogger;
}
/**
@@ -209,6 +215,15 @@ public void operationComplete(int rc, Void result) {
createComplete(BKException.Code.IncorrectParameterException, null);
return;
}
+
+ List<BookieSocketAddress> curEns = lh.getLedgerMetadata().getEnsemble(0L);
+ LOG.info("Ensemble: {} for ledger: {}", curEns, lh.getId());
+
+ for (BookieSocketAddress bsa : curEns) {
+ String ensSpread = BookKeeperClientStats.LEDGER_ENSEMBLE_BOOKIE_DISTRIBUTION + "-" + bsa;
+ statsLogger.getCounter(ensSpread).inc();
+ }
+
// return the ledger handle back
createComplete(BKException.Code.OK, lh);
}
@@ -341,7 +356,7 @@ private void create(CreateCallback cb) {
}
LedgerCreateOp op = new LedgerCreateOp(bk, builderEnsembleSize,
builderWriteQuorumSize, builderAckQuorumSize, DigestType.fromApiDigestType(builderDigestType),
- builderPassword, cb, null, builderCustomMetadata, builderWriteFlags);
+ builderPassword, cb, null, builderCustomMetadata, builderWriteFlags, bk.getStatsLogger());
ReentrantReadWriteLock closeLock = bk.getCloseLock();
closeLock.readLock().lock();
try {
@@ -400,7 +415,8 @@ private void create(CreateCallback cb) {
parent.builderWriteQuorumSize, parent.builderAckQuorumSize,
DigestType.fromApiDigestType(parent.builderDigestType),
parent.builderPassword, cb, null, parent.builderCustomMetadata,
- parent.builderWriteFlags);
+ parent.builderWriteFlags,
+ parent.bk.getStatsLogger());
ReentrantReadWriteLock closeLock = parent.bk.getCloseLock();
closeLock.readLock().lock();
try {
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestDelayEnsembleChange.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestDelayEnsembleChange.java
index b89f80055..954df02c1 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestDelayEnsembleChange.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestDelayEnsembleChange.java
@@ -24,6 +24,7 @@
import static org.apache.bookkeeper.bookie.BookKeeperServerStats.REPLACE_BOOKIE_TIME;
import static org.apache.bookkeeper.bookie.BookKeeperServerStats.WATCHER_SCOPE;
import static org.apache.bookkeeper.client.BookKeeperClientStats.CLIENT_SCOPE;
+import static org.apache.bookkeeper.client.BookKeeperClientStats.LEDGER_ENSEMBLE_BOOKIE_DISTRIBUTION;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -189,6 +190,13 @@ public void testChangeEnsembleIfBrokenAckQuorum() throws Exception {
lh.addEntry(data);
}
+ for (BookieSocketAddress addr : lh.getLedgerMetadata().getEnsembles().get(0L)) {
+ assertTrue(
+ LEDGER_ENSEMBLE_BOOKIE_DISTRIBUTION + " should be > 0 for " + addr,
+ bkc.getTestStatsProvider().getCounter(
+ CLIENT_SCOPE + "." + LEDGER_ENSEMBLE_BOOKIE_DISTRIBUTION + "-" + addr)
+ .get() > 0);
+ }
assertTrue(
"Stats should have captured a new ensemble",
bkc.getTestStatsProvider().getOpStatsLogger(
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services