diff --git a/contrib/tiflash-proxy b/contrib/tiflash-proxy index 3bd934fa8e1..cdd5996980e 160000 --- a/contrib/tiflash-proxy +++ b/contrib/tiflash-proxy @@ -1 +1 @@ -Subproject commit 3bd934fa8e1868ffbc29e1c92cda37e0c2049bf7 +Subproject commit cdd5996980ecbe5e8d9fe597ec620a5fe394d586 diff --git a/dbms/src/Storages/Transaction/KVStore.cpp b/dbms/src/Storages/Transaction/KVStore.cpp index c1394746e1a..690c7a61ab2 100644 --- a/dbms/src/Storages/Transaction/KVStore.cpp +++ b/dbms/src/Storages/Transaction/KVStore.cpp @@ -369,10 +369,10 @@ bool KVStore::canFlushRegionDataImpl(const RegionPtr & curr_region_ptr, UInt8 fl } if (can_flush && flush_if_possible) { - LOG_FMT_DEBUG(log, "{} flush region due to can_flush_data", curr_region.toString(false)); + LOG_FMT_DEBUG(log, "{} flush region due to canFlushRegionData", curr_region.toString(false)); if (tryFlushRegionCacheInStorage(tmt, curr_region, log, try_until_succeed)) { - persistRegion(curr_region, region_task_lock, "compact raft log"); + persistRegion(curr_region, region_task_lock, "canFlushRegionData before compact raft log"); curr_region.markCompactLog(); curr_region.cleanApproxMemCacheInfo(); return true;