This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 8ac28db161 Issue 3588: write meta to log header before fsync in
DirectIO mode (#3589)
8ac28db161 is described below
commit 8ac28db16118e5415c041f8da8cca73777971ce6
Author: zhaohaidao <[email protected]>
AuthorDate: Sat Oct 29 18:12:31 2022 +0800
Issue 3588: write meta to log header before fsync in DirectIO mode (#3589)
---
.../storage/directentrylogger/LogMetadata.java | 4 +-
.../storage/directentrylogger/TestMetadata.java | 80 ++++++++++++++++++++++
2 files changed, 82 insertions(+), 2 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/LogMetadata.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/LogMetadata.java
index 11e526df7d..0765175189 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/LogMetadata.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/directentrylogger/LogMetadata.java
@@ -30,6 +30,7 @@ import
org.apache.bookkeeper.util.collections.ConcurrentLongLongHashMap;
import
org.apache.bookkeeper.util.collections.ConcurrentLongLongHashMap.BiConsumerLong;
class LogMetadata {
+
/**
* Ledgers map is composed of multiple parts that can be split into
separated entries. Each of them is composed of:
*
@@ -108,8 +109,6 @@ class LogMetadata {
} finally {
serializedMap.release();
}
- writer.flush();
-
ByteBuf buf = allocator.buffer(Buffer.ALIGNMENT);
try {
Header.writeHeader(buf, ledgerMapOffset, numberOfLedgers);
@@ -117,6 +116,7 @@ class LogMetadata {
} finally {
buf.release();
}
+ writer.flush();
}
static EntryLogMetadata read(LogReader reader) throws IOException {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestMetadata.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestMetadata.java
new file mode 100644
index 0000000000..81d7ec4150
--- /dev/null
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/directentrylogger/TestMetadata.java
@@ -0,0 +1,80 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.bookkeeper.bookie.storage.directentrylogger;
+
+import static
org.apache.bookkeeper.bookie.storage.directentrylogger.DirectEntryLogger.logFilename;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import java.io.File;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.apache.bookkeeper.bookie.EntryLogMetadata;
+import org.apache.bookkeeper.common.util.nativeio.NativeIOImpl;
+import org.apache.bookkeeper.slogger.Slogger;
+import org.apache.bookkeeper.stats.NullStatsLogger;
+import org.apache.bookkeeper.stats.OpStatsLogger;
+import org.apache.bookkeeper.test.TmpDirs;
+import org.junit.After;
+import org.junit.Test;
+
+public class TestMetadata {
+ private static final Slogger slog = Slogger.CONSOLE;
+ private final OpStatsLogger opLogger =
NullStatsLogger.INSTANCE.getOpStatsLogger("null");
+
+ private final TmpDirs tmpDirs = new TmpDirs();
+ private final ExecutorService writeExecutor =
Executors.newSingleThreadExecutor();
+
+ @After
+ public void cleanup() throws Exception {
+ tmpDirs.cleanup();
+ writeExecutor.shutdownNow();
+ }
+
+ @Test
+ public void testReadMetaFromHeader() throws Exception {
+ File ledgerDir = tmpDirs.createNew("writeMetadataBeforeFsync", "logs");
+ int logId = 5678;
+ try (BufferPool buffers = new BufferPool(new NativeIOImpl(),
Buffer.ALIGNMENT, 8);
+ LogWriter writer = new DirectWriter(logId, logFilename(ledgerDir,
logId),
+ 1 << 24, writeExecutor,
+ buffers, new NativeIOImpl(), Slogger.CONSOLE)) {
+ long offset = 4096L;
+ writer.position(offset);
+ EntryLogMetadata entryLogMetadata = new EntryLogMetadata(logId);
+ entryLogMetadata.addLedgerSize(1, 10);
+ entryLogMetadata.addLedgerSize(2, 11);
+ LogMetadata.write(writer, entryLogMetadata,
ByteBufAllocator.DEFAULT);
+ try (LogReader reader = new DirectReader(logId,
logFilename(ledgerDir, logId),
+ ByteBufAllocator.DEFAULT,
+ new NativeIOImpl(), Buffer.ALIGNMENT,
+ 1 << 20, opLogger)) {
+ ByteBuf header = reader.readBufferAt(0,
Header.LOGFILE_LEGACY_HEADER_SIZE);
+ assertThat(Header.HEADER_V1,
equalTo(Header.extractVersion(header)));
+ assertThat(offset,
equalTo(Header.extractLedgerMapOffset(header)));
+ assertThat(2, equalTo(Header.extractLedgerCount(header)));
+ }
+ }
+ }
+
+}
