You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/03/28 07:23:30 UTC
[GitHub] sijie closed pull request #1461: If cursor update to BK fails, fallback to meta store
sijie closed pull request #1461: If cursor update to BK fails, fallback to meta store
URL: https://github.com/apache/incubator-pulsar/pull/1461
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/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
index 45fcf9036..c2fbbab8b 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
@@ -1820,6 +1820,7 @@ private void persistPositionMetaStore(long cursorsLedgerId, PositionImpl positio
new MetaStoreCallback<Void>() {
@Override
public void operationComplete(Void result, Stat stat) {
+ cursorLedgerStat = stat;
callback.operationComplete(result, stat);
}
@@ -2055,7 +2056,26 @@ void persistPositionToLedger(final LedgerHandle lh, MarkDeleteEntry mdEntry, fin
// If we've had a write error, the ledger will be automatically closed, we need to create a new one,
// in the meantime the mark-delete will be queued.
STATE_UPDATER.compareAndSet(ManagedCursorImpl.this, State.Open, State.NoLedger);
- callback.operationFailed(createManagedLedgerException(rc));
+
+ // Before giving up, try to persist the position in the metadata store
+ persistPositionMetaStore(-1, position, mdEntry.properties, new MetaStoreCallback<Void>() {
+ @Override
+ public void operationComplete(Void result, Stat stat) {
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "[{}][{}] Updated cursor in meta store after previous failure in ledger at position {}",
+ ledger.getName(), name, position);
+ }
+ callback.operationComplete();
+ }
+
+ @Override
+ public void operationFailed(MetaStoreException e) {
+ log.warn("[{}][{}] Failed to update cursor in meta store after previous failure in ledger: {}",
+ ledger.getName(), name, e.getMessage());
+ callback.operationFailed(createManagedLedgerException(rc));
+ }
+ }, true);
}
}, null);
}
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
index 312b8949c..ad85a35a9 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
@@ -64,6 +64,7 @@
import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedCursorInfo;
import org.apache.bookkeeper.mledger.proto.MLDataFormats.PositionInfo;
import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
+import org.apache.zookeeper.KeeperException.Code;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
@@ -409,11 +410,29 @@ void markDeleteWithErrors() throws Exception {
stopBookKeeper();
assertEquals(entries.size(), 1);
+ // Mark-delete should succeed if BK is down
+ cursor.markDelete(entries.get(0).getPosition());
+
+ entries.forEach(e -> e.release());
+ }
+
+ @Test(timeOut = 20000)
+ void markDeleteWithZKErrors() throws Exception {
+ ManagedLedger ledger = factory.open("my_test_ledger");
+ ManagedCursor cursor = ledger.openCursor("c1");
+ ledger.addEntry("dummy-entry-1".getBytes(Encoding));
+ List<Entry> entries = cursor.readEntries(100);
+
+ assertEquals(entries.size(), 1);
+
+ stopBookKeeper();
+ stopZooKeeper();
+
try {
cursor.markDelete(entries.get(0).getPosition());
- fail("call should have failed");
- } catch (ManagedLedgerException e) {
- // ok
+ fail("Should have failed");
+ } catch (Exception e) {
+ // Expected
}
entries.forEach(e -> e.release());
@@ -1022,6 +1041,7 @@ void errorCreatingCursor() throws Exception {
ManagedLedger ledger = factory.open("my_test_ledger");
bkc.failAfter(1, BKException.Code.NotEnoughBookiesException);
+ zkc.failNow(Code.SESSIONEXPIRED);
try {
ledger.openCursor("c1");
fail("should have failed");
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java
index 5004d28c8..4efeefb9c 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java
@@ -486,6 +486,7 @@ public void recoverAfterMarkDeleteError() throws Exception {
Position position = ledger.addEntry("entry".getBytes());
bkc.failNow(BKException.Code.BookieHandleNotAvailableException);
+ zkc.failNow(Code.CONNECTIONLOSS);
try {
cursor.markDelete(position);
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java
index afc751c68..ff99da390 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java
@@ -252,12 +252,8 @@ void markDeleteWithErrors() throws Exception {
stopBookKeeper();
assertEquals(entries.size(), 1);
- try {
- cursor.markDelete(entries.get(0).getPosition());
- fail("call should have failed");
- } catch (ManagedLedgerException e) {
- // ok
- }
+ // Mark-delete should succeed if BK is down
+ cursor.markDelete(entries.get(0).getPosition());
entries.forEach(e -> e.release());
}
----------------------------------------------------------------
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