Skip to content

Commit b42dda8

Browse files
authored
Merge pull request #198 from RongtongJin/fix_log
Add a lightweight log implementation slf4j-simple
2 parents c5c9ac9 + 887c349 commit b42dda8

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@
6161
<artifactId>slf4j-api</artifactId>
6262
<version>1.7.36</version>
6363
</dependency>
64-
64+
<dependency>
65+
<groupId>org.slf4j</groupId>
66+
<artifactId>slf4j-simple</artifactId>
67+
<version>1.7.36</version>
68+
</dependency>
6569
<!-- Test only dependencies follow -->
6670
<dependency>
6771
<groupId>org.apache.logging.log4j</groupId>

src/main/java/io/openmessaging/storage/dledger/store/file/DLedgerMmapFileStore.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public DLedgerMmapFileStore(DLedgerConfig dLedgerConfig, MemberState memberState
7777
this.memberState = memberState;
7878
if (dLedgerConfig.getDataStorePath().contains(DLedgerConfig.MULTI_PATH_SPLITTER)) {
7979
this.dataFileList = new MultiPathMmapFileList(dLedgerConfig, dLedgerConfig.getMappedFileSizeForEntryData(),
80-
this::getFullStorePaths);
80+
this::getFullStorePaths);
8181
} else {
8282
this.dataFileList = new MmapFileList(dLedgerConfig.getDataStorePath(), dLedgerConfig.getMappedFileSizeForEntryData());
8383
}
@@ -218,7 +218,7 @@ public void recover() {
218218
}
219219

220220
int size = byteBuffer.getInt();
221-
if(size == 0){
221+
if (size == 0) {
222222
logger.info("Recover data file to the end of {} ", mappedFile.getFileName());
223223
break;
224224
}
@@ -567,6 +567,7 @@ public Pair<Long, Integer> getEntryPosAndSize(Long index) {
567567
SelectMmapBufferResult.release(indexSbr);
568568
}
569569
}
570+
570571
public void indexCheck(Long index) {
571572
PreConditions.check(index >= 0, DLedgerResponseCode.INDEX_OUT_OF_RANGE, "%d should gt 0", index);
572573
PreConditions.check(index >= ledgerBeginIndex, DLedgerResponseCode.INDEX_LESS_THAN_LOCAL_BEGIN, "%d should be gt %d, ledgerBeginIndex may be revised", index, ledgerBeginIndex);
@@ -690,10 +691,10 @@ public CleanSpaceService(String name, Logger logger) {
690691
storeBaseRatio = DLedgerUtils.getDiskPartitionSpaceUsedPercent(dLedgerConfig.getStoreBaseDir());
691692
dataRatio = calcDataStorePathPhysicRatio();
692693
long hourOfMs = 3600L * 1000L;
693-
long fileReservedTimeMs = dLedgerConfig.getFileReservedHours() * hourOfMs;
694+
long fileReservedTimeMs = dLedgerConfig.getFileReservedHours() * hourOfMs;
694695
if (fileReservedTimeMs < hourOfMs) {
695696
logger.warn("The fileReservedTimeMs={} is smaller than hourOfMs={}", fileReservedTimeMs, hourOfMs);
696-
fileReservedTimeMs = hourOfMs;
697+
fileReservedTimeMs = hourOfMs;
697698
}
698699
//If the disk is full, should prevent more data to get in
699700
DLedgerMmapFileStore.this.isDiskFull = isNeedForbiddenWrite();

0 commit comments

Comments
 (0)