sijie commented on a change in pull request #1281: Issue #570: Introducing EntryLogManager. URL: https://github.com/apache/bookkeeper/pull/1281#discussion_r181924215
########## File path: bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java ########## @@ -788,89 +812,418 @@ private long readLastLogId(File f) { } } - /** - * Flushes all rotated log channels. After log channels are flushed, - * move leastUnflushedLogId ptr to current logId. - */ - void checkpoint() throws IOException { - flushRotatedLogs(); + interface EntryLogManager { + + /* + * add entry to the corresponding entrylog and return the position of + * the entry in the entrylog + */ + long addEntry(long ledger, ByteBuf entry, boolean rollLog) throws IOException; + + /* + * gets the active logChannel with the given entryLogId. null if it is + * not existing. + */ + BufferedLogChannel getCurrentLogIfPresent(long entryLogId); + /* - * In the case of entryLogPerLedgerEnabled we need to flush both - * rotatedlogs and currentlogs. This is needed because syncThread - * periodically does checkpoint and at this time all the logs should - * be flushed. + * Returns eligible writable ledger dir for the creation next entrylog + */ + File getDirForNextEntryLog(List<File> writableLedgerDirs); + + /* + * Do the operations required for checkpoint. + */ + void checkpoint() throws IOException; + + /* + * flush both current and rotated logs. + */ + void flush() throws IOException; + + /* + * close current logs. + */ + void close() throws IOException; + + /* + * force close current logs. + */ + void forceClose(); + + /* + * + */ + void prepareSortedLedgerStorageCheckpoint(long numBytesFlushed) throws IOException; + + /* + * this method should be called before doing entrymemtable flush, it + * would save the state of the entrylogger before entrymemtable flush + * and commitEntryMemTableFlush would take appropriate action after + * entrymemtable flush. + */ + void prepareEntryMemTableFlush(); + + /* + * this method should be called after doing entrymemtable flush,it would + * take appropriate action after entrymemtable flush depending on the + * current state of the entrylogger and the state of the entrylogger + * during prepareEntryMemTableFlush. * - * TODO: When EntryLogManager is introduced in the subsequent sub-tasks of - * this Issue, I will move this logic to individual implamentations of - * EntryLogManager and it would be free of this booalen flag based logic. + * It is assumed that there would be corresponding + * prepareEntryMemTableFlush for every commitEntryMemTableFlush and both + * would be called from the same thread. * + * returns boolean value indicating whether EntryMemTable should do checkpoint + * after this commit method. */ - if (entryLogPerLedgerEnabled) { - flushCurrentLog(); + boolean commitEntryMemTableFlush() throws IOException; + } + + abstract class EntryLogManagerBase implements EntryLogManager { + volatile List<BufferedLogChannel> rotatedLogChannels; + + private final FastThreadLocal<ByteBuf> sizeBufferForAdd = new FastThreadLocal<ByteBuf>() { + @Override + protected ByteBuf initialValue() throws Exception { + return Unpooled.buffer(4); + } + }; + + /* + * This method should be guarded by a lock, so callers of this method + * should be in the right scope of the lock. + */ + @Override + public long addEntry(long ledger, ByteBuf entry, boolean rollLog) throws IOException { + int entrySize = entry.readableBytes() + 4; // Adding 4 bytes to prepend the size + BufferedLogChannel logChannel = getCurrentLogForLedgerForAddEntry(ledger, entrySize, rollLog); + ByteBuf sizeBuffer = sizeBufferForAdd.get(); + sizeBuffer.clear(); + sizeBuffer.writeInt(entry.readableBytes()); + logChannel.write(sizeBuffer); + + long pos = logChannel.position(); + logChannel.write(entry); + logChannel.registerWrittenEntry(ledger, entrySize); + + return (logChannel.getLogId() << 32L) | pos; + } + + boolean reachEntryLogLimit(BufferedLogChannel logChannel, long size) { + if (logChannel == null) { + return false; + } + return logChannel.position() + size > logSizeLimit; + } + + boolean readEntryLogHardLimit(BufferedLogChannel logChannel, long size) { + if (logChannel == null) { + return false; + } + return logChannel.position() + size > Integer.MAX_VALUE; + } + + abstract BufferedLogChannel getCurrentLogForLedger(long ledgerId); + + abstract BufferedLogChannel getCurrentLogForLedgerForAddEntry(long ledgerId, int entrySize, boolean rollLog) + throws IOException; + + abstract void setCurrentLogForLedgerAndAddToRotate(long ledgerId, BufferedLogChannel logChannel); + + /* + * flush current logs. + */ + abstract void flushCurrentLogs() throws IOException; + + /* + * flush rotated logs. + */ + abstract void flushRotatedLogs() throws IOException; + + List<BufferedLogChannel> getRotatedLogChannels() { + return rotatedLogChannels; + } + + @Override + public void flush() throws IOException { + flushRotatedLogs(); + flushCurrentLogs(); + } + + void flushLogChannel(BufferedLogChannel logChannel, boolean forceMetadata) throws IOException { + if (logChannel != null) { + logChannel.flushAndForceWrite(forceMetadata); + LOG.debug("Flush and sync current entry logger {}", logChannel.getLogId()); + } + } + + /* + * Creates a new log file. This method should be guarded by a lock, + * so callers of this method should be in right scope of the lock. + */ + void createNewLog(long ledgerId) throws IOException { Review comment: please keep a method like `rollOldLogAndCreateNewLog`. because this method is replacing a lot of places that used to call `rollLog`. it would be good to have `roll log` in the method name, that would provide a more meaningful name. ``` public void rollOldLogAndCreateNewLog(long ledgerId) { createNewLog(long ledgerId); } ``` ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services