You are viewing a plain text version of this content. The canonical link for it is here.
Posted to distributedlog-issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2017/11/01 16:06:45 UTC
[GitHub] sijie closed pull request #235: Issue 233: DistributionSchedule.WriteSet cannot be converted to List
sijie closed pull request #235: Issue 233: DistributionSchedule.WriteSet cannot be converted to List
URL: https://github.com/apache/distributedlog/pull/235
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/distributedlog-core/src/main/java/org/apache/bookkeeper/client/LedgerReader.java b/distributedlog-core/src/main/java/org/apache/bookkeeper/client/LedgerReader.java
index 63c18d4b..ccdc52b4 100644
--- a/distributedlog-core/src/main/java/org/apache/bookkeeper/client/LedgerReader.java
+++ b/distributedlog-core/src/main/java/org/apache/bookkeeper/client/LedgerReader.java
@@ -27,6 +27,7 @@
import java.util.Set;
import java.util.SortedMap;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.bookkeeper.client.DistributionSchedule.WriteSet;
import org.apache.bookkeeper.net.BookieSocketAddress;
import org.apache.bookkeeper.proto.BookieClient;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GenericCallback;
@@ -86,7 +87,7 @@ public LedgerReader(BookKeeper bkc) {
public void readEntriesFromAllBookies(final LedgerHandle lh, long eid,
final GenericCallback<Set<ReadResult<ByteBuf>>> callback) {
- List<Integer> writeSet = lh.distributionSchedule.getWriteSet(eid);
+ WriteSet writeSet = lh.distributionSchedule.getWriteSet(eid);
final AtomicInteger numBookies = new AtomicInteger(writeSet.size());
final Set<ReadResult<ByteBuf>> readResults = new HashSet<>();
ReadEntryCallback readEntryCallback = new ReadEntryCallback() {
@@ -118,7 +119,8 @@ public void readEntryComplete(int rc, long lid, long eid, ByteBuf buffer, Object
};
ArrayList<BookieSocketAddress> ensemble = lh.getLedgerMetadata().getEnsemble(eid);
- for (Integer idx : writeSet) {
+ for (int i = 0; i < writeSet.size(); i++) {
+ int idx = writeSet.get(i);
bookieClient.readEntry(ensemble.get(idx), lh.getId(), eid, readEntryCallback, ensemble.get(idx));
}
}
@@ -181,7 +183,7 @@ public void readComplete(int rc, LedgerHandle lh, Enumeration<LedgerEntry> entri
public void readLacs(final LedgerHandle lh, long eid,
final GenericCallback<Set<ReadResult<Long>>> callback) {
- List<Integer> writeSet = lh.distributionSchedule.getWriteSet(eid);
+ WriteSet writeSet = lh.distributionSchedule.getWriteSet(eid);
final AtomicInteger numBookies = new AtomicInteger(writeSet.size());
final Set<ReadResult<Long>> readResults = new HashSet<ReadResult<Long>>();
ReadEntryCallback readEntryCallback = (rc, lid, eid1, buffer, ctx) -> {
@@ -204,7 +206,8 @@ public void readLacs(final LedgerHandle lh, long eid,
};
ArrayList<BookieSocketAddress> ensemble = lh.getLedgerMetadata().getEnsemble(eid);
- for (Integer idx : writeSet) {
+ for (int i = 0; i < writeSet.size(); i++) {
+ int idx = writeSet.get(i);
bookieClient.readEntry(ensemble.get(idx), lh.getId(), eid, readEntryCallback, ensemble.get(idx));
}
}
diff --git a/distributedlog-core/src/main/java/org/apache/distributedlog/BookKeeperClient.java b/distributedlog-core/src/main/java/org/apache/distributedlog/BookKeeperClient.java
index d1c1d6fd..33baa9de 100644
--- a/distributedlog-core/src/main/java/org/apache/distributedlog/BookKeeperClient.java
+++ b/distributedlog-core/src/main/java/org/apache/distributedlog/BookKeeperClient.java
@@ -41,10 +41,8 @@
import org.apache.distributedlog.common.concurrent.FutureUtils;
import org.apache.distributedlog.exceptions.AlreadyClosedException;
import org.apache.distributedlog.exceptions.DLInterruptedException;
-import org.apache.distributedlog.exceptions.ZKException;
import org.apache.distributedlog.net.NetUtils;
import org.apache.distributedlog.util.ConfUtils;
-import org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,7 +83,7 @@ private synchronized void commonInitialization(
String ledgersPath,
EventLoopGroup eventLoopGroup,
StatsLogger statsLogger, HashedWheelTimer requestTimer)
- throws IOException, InterruptedException, KeeperException {
+ throws IOException, InterruptedException {
ClientConfiguration bkConfig = new ClientConfiguration();
bkConfig.setAddEntryTimeout(conf.getBKClientWriteTimeout());
bkConfig.setReadTimeout(conf.getBKClientReadTimeout());
@@ -109,14 +107,18 @@ private synchronized void commonInitialization(
final DNSToSwitchMapping dnsResolver =
NetUtils.getDNSResolver(dnsResolverCls, conf.getBkDNSResolverOverrides());
- this.bkc = BookKeeper.forConfig(bkConfig)
- .setZookeeper(zkc.get())
- .setEventLoopGroup(eventLoopGroup)
- .setStatsLogger(statsLogger)
- .dnsResolver(dnsResolver)
- .requestTimer(requestTimer)
- .featureProvider(featureProvider.orNull())
- .build();
+ try {
+ this.bkc = BookKeeper.forConfig(bkConfig)
+ .setZookeeper(zkc.get())
+ .setEventLoopGroup(eventLoopGroup)
+ .setStatsLogger(statsLogger)
+ .dnsResolver(dnsResolver)
+ .requestTimer(requestTimer)
+ .featureProvider(featureProvider.orNull())
+ .build();
+ } catch (BKException bke) {
+ throw new IOException(bke);
+ }
}
BookKeeperClient(DistributedLogConfiguration conf,
@@ -167,8 +169,6 @@ private synchronized void initialize() throws IOException {
commonInitialization(conf, ledgersPath, eventLoopGroup, statsLogger, requestTimer);
} catch (InterruptedException e) {
throw new DLInterruptedException("Interrupted on creating bookkeeper client " + name + " : ", e);
- } catch (KeeperException e) {
- throw new ZKException("Error on creating bookkeeper client " + name + " : ", e);
}
if (ownZK) {
----------------------------------------------------------------
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