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/19 09:10:29 UTC
[GitHub] sijie closed pull request #1009: [Merge Yahoo repo]: CMS-1487: Provide tool to read entries from a particular bookie
sijie closed pull request #1009: [Merge Yahoo repo]: CMS-1487: Provide tool to read entries from a particular bookie
URL: https://github.com/apache/bookkeeper/pull/1009
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/bookie/BookieShell.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
index fcd632969..523511079 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
@@ -26,7 +26,11 @@
import com.google.common.net.InetAddresses;
import com.google.common.util.concurrent.AbstractFuture;
import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.util.concurrent.DefaultThreadFactory;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -56,8 +60,12 @@
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
+import java.util.stream.LongStream;
import org.apache.bookkeeper.bookie.BookieException.CookieNotFoundException;
import org.apache.bookkeeper.bookie.BookieException.InvalidCookieException;
import org.apache.bookkeeper.bookie.CheckpointSource.Checkpoint;
@@ -85,6 +93,7 @@
import org.apache.bookkeeper.meta.LedgerManagerFactory;
import org.apache.bookkeeper.meta.LedgerUnderreplicationManager;
import org.apache.bookkeeper.net.BookieSocketAddress;
+import org.apache.bookkeeper.proto.BookieClient;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GenericCallback;
import org.apache.bookkeeper.replication.AuditorElector;
import org.apache.bookkeeper.stats.NullStatsLogger;
@@ -94,6 +103,7 @@
import org.apache.bookkeeper.util.IOUtils;
import org.apache.bookkeeper.util.LedgerIdFormatter;
import org.apache.bookkeeper.util.MathUtils;
+import org.apache.bookkeeper.util.OrderedSafeExecutor;
import org.apache.bookkeeper.util.Tool;
import org.apache.bookkeeper.versioning.Version;
import org.apache.bookkeeper.versioning.Versioned;
@@ -570,7 +580,9 @@ Options getOptions() {
lOpts.addOption("l", "ledgerid", true, "Ledger ID");
lOpts.addOption("fe", "firstentryid", true, "First EntryID");
lOpts.addOption("le", "lastentryid", true, "Last EntryID");
- lOpts.addOption("r", "force-recovery", false, "Ensure the ledger is properly closed before reading");
+ lOpts.addOption("r", "force-recovery", false,
+ "Ensure the ledger is properly closed before reading");
+ lOpts.addOption("b", "bookie", true, "Only read from a specific bookie");
}
@Override
@@ -585,7 +597,7 @@ String getDescription() {
@Override
String getUsage() {
- return "readledger [-msg] -ledgerid <ledgerid> "
+ return "readledger [-bookie <address:port>] [-msg] -ledgerid <ledgerid> "
+ "[-firstentryid <firstentryid> [-lastentryid <lastentryid>]] "
+ "[-force-recovery]";
}
@@ -603,13 +615,18 @@ int runCmd(CommandLine cmdLine) throws Exception {
boolean printMsg = cmdLine.hasOption("m");
boolean forceRecovery = cmdLine.hasOption("r");
+ final BookieSocketAddress bookie;
+ if (cmdLine.hasOption("b")) {
+ // A particular bookie was specified
+ bookie = new BookieSocketAddress(cmdLine.getOptionValue("b"));
+ } else {
+ bookie = null;
+ }
ClientConfiguration conf = new ClientConfiguration();
conf.addConfiguration(bkConf);
- BookKeeperAdmin bk = null;
- try {
- bk = new BookKeeperAdmin(conf);
+ try (BookKeeperAdmin bk = new BookKeeperAdmin(conf)) {
if (forceRecovery) {
// Force the opening of the ledger to trigger recovery
try (LedgerHandle lh = bk.openLedger(ledgerId)) {
@@ -619,17 +636,58 @@ int runCmd(CommandLine cmdLine) throws Exception {
}
}
- Iterator<LedgerEntry> entries = bk.readEntries(ledgerId, firstEntry, lastEntry).iterator();
- while (entries.hasNext()) {
- LedgerEntry entry = entries.next();
- formatEntry(entry, printMsg);
- }
- } catch (Exception e) {
- LOG.error("Error reading entries from ledger {}", ledgerId, e);
- return -1;
- } finally {
- if (bk != null) {
- bk.close();
+ if (bookie == null) {
+ // No bookie was specified, use normal bk client
+ Iterator<LedgerEntry> entries = bk.readEntries(ledgerId, firstEntry, lastEntry).iterator();
+ while (entries.hasNext()) {
+ LedgerEntry entry = entries.next();
+ formatEntry(entry, printMsg);
+ }
+ } else {
+ // Use BookieClient to target a specific bookie
+ EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
+ OrderedSafeExecutor executor = OrderedSafeExecutor.newBuilder()
+ .numThreads(1)
+ .name("BookieClientScheduler")
+ .build();
+
+ ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(
+ new DefaultThreadFactory("BookKeeperClientSchedulerPool"));
+
+ BookieClient bookieClient = new BookieClient(conf, eventLoopGroup, executor,
+ scheduler, NullStatsLogger.INSTANCE);
+
+ LongStream.range(firstEntry, lastEntry).forEach(entryId -> {
+ CompletableFuture<Void> future = new CompletableFuture<>();
+
+ bookieClient.readEntry(bookie, ledgerId, entryId,
+ (rc, ledgerId1, entryId1, buffer, ctx) -> {
+ if (rc != BKException.Code.OK) {
+ LOG.error("Failed to read entry {} -- {}", entryId1, BKException.getMessage(rc));
+ future.completeExceptionally(BKException.create(rc));
+ return;
+ }
+
+ System.out.println("--------- Lid=" + ledgerIdFormatter.formatLedgerId(ledgerId)
+ + ", Eid=" + entryId + " ---------");
+ if (printMsg) {
+ System.out.println("Data: " + ByteBufUtil.prettyHexDump(buffer));
+ }
+
+ buffer.release();
+ future.complete(null);
+ }, null);
+
+ try {
+ future.get();
+ } catch (Exception e) {
+ LOG.error("Error future.get while reading entries from ledger {}", ledgerId, e);
+ }
+ });
+
+ eventLoopGroup.shutdownGracefully();
+ executor.shutdown();
+ bookieClient.close();
}
}
----------------------------------------------------------------
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