Skip to content

Fix write entry failed in without writing journal case #3884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hangc0276 merged 1 commit into from
Mar 26, 2023
Merged

Fix write entry failed in without writing journal case #3884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
import org.apache.bookkeeper.net.BookieId;
import org.apache.bookkeeper.net.BookieSocketAddress;
import org.apache.bookkeeper.net.DNS;
import org.apache.bookkeeper.proto.BookieRequestHandler;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.WriteCallback;
import org.apache.bookkeeper.stats.NullStatsLogger;
import org.apache.bookkeeper.stats.StatsLogger;
Expand Down Expand Up @@ -948,6 +949,9 @@ private void addEntryInternal(LedgerDescriptor handle, ByteBuf entry,

if (!writeDataToJournal) {
cb.writeComplete(0, ledgerId, entryId, null, ctx);
if (ctx instanceof BookieRequestHandler) {
((BookieRequestHandler) ctx).flushPendingResponse();
}
return;
}

Expand Down
19 changes: 19 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -68,19 +69,35 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.powermock.reflect.Whitebox;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Testing ledger write entry cases.
*/
@RunWith(Parameterized.class)
public class BookieWriteLedgerTest extends
BookKeeperClusterTestCase implements AddCallback {

private static final Logger LOG = LoggerFactory
.getLogger(BookieWriteLedgerTest.class);

@Parameterized.Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] {
{ true, true }, { true, false }, { false, true }, { false, false }
});
}

@Parameterized.Parameter(0)
public boolean useV2;

@Parameterized.Parameter(1)
public boolean writeJournal;

byte[] ledgerPassword = "aaa".getBytes();
LedgerHandle lh, lh2;
Enumeration<LedgerEntry> ls;
Expand Down Expand Up @@ -119,12 +136,14 @@ public BookieWriteLedgerTest() {
String ledgerManagerFactory = "org.apache.bookkeeper.meta.HierarchicalLedgerManagerFactory";
// set ledger manager
baseConf.setLedgerManagerFactoryClassName(ledgerManagerFactory);
baseConf.setJournalWriteData(writeJournal);
/*
* 'testLedgerCreateAdvWithLedgerIdInLoop2' testcase relies on skipListSizeLimit,
* so setting it to some small value for making that testcase lite.
*/
baseConf.setSkipListSizeLimit(4 * 1024 * 1024);
baseClientConf.setLedgerManagerFactoryClassName(ledgerManagerFactory);
baseClientConf.setUseV2WireProtocol(useV2);
}

/**
Expand Down