diff --git a/be/src/io/cache/block_file_cache_profile.cpp b/be/src/io/cache/block_file_cache_profile.cpp index 3b31f6700edb46..f11679e2666fd4 100644 --- a/be/src/io/cache/block_file_cache_profile.cpp +++ b/be/src/io/cache/block_file_cache_profile.cpp @@ -67,13 +67,16 @@ void FileCacheMetrics::update_metrics_callback() { FileCacheProfileReporter::FileCacheProfileReporter(RuntimeProfile* profile) { static const char* cache_profile = "FileCache"; - ADD_TIMER_WITH_LEVEL(profile, cache_profile, 1); + ADD_TIMER_WITH_LEVEL(profile, cache_profile, 2); num_local_io_total = ADD_CHILD_COUNTER_WITH_LEVEL(profile, "NumLocalIOTotal", TUnit::UNIT, cache_profile, 1); num_remote_io_total = ADD_CHILD_COUNTER_WITH_LEVEL(profile, "NumRemoteIOTotal", TUnit::UNIT, cache_profile, 1); local_io_timer = ADD_CHILD_TIMER_WITH_LEVEL(profile, "LocalIOUseTimer", cache_profile, 1); remote_io_timer = ADD_CHILD_TIMER_WITH_LEVEL(profile, "RemoteIOUseTimer", cache_profile, 1); + num_peer_io_total = + ADD_CHILD_COUNTER_WITH_LEVEL(profile, "NumPeerIOTotal", TUnit::UNIT, cache_profile, 1); + peer_io_timer = ADD_CHILD_TIMER_WITH_LEVEL(profile, "PeerIOUseTimer", cache_profile, 1); remote_wait_timer = ADD_CHILD_TIMER_WITH_LEVEL(profile, "WaitOtherDownloaderTimer", cache_profile, 1); write_cache_io_timer = @@ -86,6 +89,8 @@ FileCacheProfileReporter::FileCacheProfileReporter(RuntimeProfile* profile) { TUnit::BYTES, cache_profile, 1); bytes_scanned_from_remote = ADD_CHILD_COUNTER_WITH_LEVEL(profile, "BytesScannedFromRemote", TUnit::BYTES, cache_profile, 1); + bytes_scanned_from_peer = ADD_CHILD_COUNTER_WITH_LEVEL(profile, "BytesScannedFromPeer", + TUnit::BYTES, cache_profile, 1); read_cache_file_directly_timer = ADD_CHILD_TIMER_WITH_LEVEL(profile, "ReadCacheFileDirectlyTimer", cache_profile, 1); cache_get_or_set_timer = @@ -98,29 +103,38 @@ FileCacheProfileReporter::FileCacheProfileReporter(RuntimeProfile* profile) { profile, "InvertedIndexNumLocalIOTotal", TUnit::UNIT, cache_profile, 1); inverted_index_num_remote_io_total = ADD_CHILD_COUNTER_WITH_LEVEL( profile, "InvertedIndexNumRemoteIOTotal", TUnit::UNIT, cache_profile, 1); + inverted_index_num_peer_io_total = ADD_CHILD_COUNTER_WITH_LEVEL( + profile, "InvertedIndexNumPeerIOTotal", TUnit::UNIT, cache_profile, 1); inverted_index_bytes_scanned_from_cache = ADD_CHILD_COUNTER_WITH_LEVEL( profile, "InvertedIndexBytesScannedFromCache", TUnit::BYTES, cache_profile, 1); inverted_index_bytes_scanned_from_remote = ADD_CHILD_COUNTER_WITH_LEVEL( profile, "InvertedIndexBytesScannedFromRemote", TUnit::BYTES, cache_profile, 1); + inverted_index_bytes_scanned_from_peer = ADD_CHILD_COUNTER_WITH_LEVEL( + profile, "InvertedIndexBytesScannedFromPeer", TUnit::BYTES, cache_profile, 1); inverted_index_local_io_timer = ADD_CHILD_TIMER_WITH_LEVEL(profile, "InvertedIndexLocalIOUseTimer", cache_profile, 1); inverted_index_remote_io_timer = ADD_CHILD_TIMER_WITH_LEVEL(profile, "InvertedIndexRemoteIOUseTimer", cache_profile, 1); inverted_index_io_timer = ADD_CHILD_TIMER_WITH_LEVEL(profile, "InvertedIndexIOTimer", cache_profile, 1); + inverted_index_peer_io_timer = + ADD_CHILD_TIMER_WITH_LEVEL(profile, "InvertedIndexPeerIOUseTimer", cache_profile, 1); } void FileCacheProfileReporter::update(const FileCacheStatistics* statistics) const { COUNTER_UPDATE(num_local_io_total, statistics->num_local_io_total); COUNTER_UPDATE(num_remote_io_total, statistics->num_remote_io_total); + COUNTER_UPDATE(num_peer_io_total, statistics->num_peer_io_total); COUNTER_UPDATE(local_io_timer, statistics->local_io_timer); COUNTER_UPDATE(remote_io_timer, statistics->remote_io_timer); + COUNTER_UPDATE(peer_io_timer, statistics->peer_io_timer); COUNTER_UPDATE(remote_wait_timer, statistics->remote_wait_timer); COUNTER_UPDATE(write_cache_io_timer, statistics->write_cache_io_timer); COUNTER_UPDATE(bytes_write_into_cache, statistics->bytes_write_into_cache); COUNTER_UPDATE(num_skip_cache_io_total, statistics->num_skip_cache_io_total); COUNTER_UPDATE(bytes_scanned_from_cache, statistics->bytes_read_from_local); COUNTER_UPDATE(bytes_scanned_from_remote, statistics->bytes_read_from_remote); + COUNTER_UPDATE(bytes_scanned_from_peer, statistics->bytes_read_from_peer); COUNTER_UPDATE(read_cache_file_directly_timer, statistics->read_cache_file_directly_timer); COUNTER_UPDATE(cache_get_or_set_timer, statistics->cache_get_or_set_timer); COUNTER_UPDATE(lock_wait_timer, statistics->lock_wait_timer); @@ -131,12 +145,16 @@ void FileCacheProfileReporter::update(const FileCacheStatistics* statistics) con statistics->inverted_index_num_local_io_total); COUNTER_UPDATE(inverted_index_num_remote_io_total, statistics->inverted_index_num_remote_io_total); + COUNTER_UPDATE(inverted_index_num_peer_io_total, statistics->inverted_index_num_peer_io_total); COUNTER_UPDATE(inverted_index_bytes_scanned_from_cache, statistics->inverted_index_bytes_read_from_local); COUNTER_UPDATE(inverted_index_bytes_scanned_from_remote, statistics->inverted_index_bytes_read_from_remote); + COUNTER_UPDATE(inverted_index_bytes_scanned_from_peer, + statistics->inverted_index_bytes_read_from_peer); COUNTER_UPDATE(inverted_index_local_io_timer, statistics->inverted_index_local_io_timer); COUNTER_UPDATE(inverted_index_remote_io_timer, statistics->inverted_index_remote_io_timer); + COUNTER_UPDATE(inverted_index_peer_io_timer, statistics->inverted_index_peer_io_timer); COUNTER_UPDATE(inverted_index_io_timer, statistics->inverted_index_io_timer); } diff --git a/docker/runtime/doris-compose/Dockerfile b/docker/runtime/doris-compose/Dockerfile index d3f6f1a22ce498..f3b4c77fdea6b3 100644 --- a/docker/runtime/doris-compose/Dockerfile +++ b/docker/runtime/doris-compose/Dockerfile @@ -23,7 +23,7 @@ # choose a base image # doris 2.1, 3.0+, master use JDK 17 -ARG JDK_IMAGE=openjdk:17-jdk-slim +ARG JDK_IMAGE=openjdk:17.0.1-jdk-slim # doris 2.0 use JDK 8 # build 2.0 image, example: @@ -88,4 +88,4 @@ COPY --chmod=777 ${OUTPUT_PATH} /opt/apache-doris/ RUN sed -i 's/\/echo/g' /opt/apache-doris/be/bin/start_be.sh RUN if [ -d /opt/apache-doris/ms/bin ]; then \ sed -i 's/\/echo/g' /opt/apache-doris/ms/bin/start.sh ; \ - fi \ No newline at end of file + fi