Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: refactoring LruCacheLayer with list_with_metakey and concurrent_stat_in_list #4596

Merged
merged 10 commits into from
Aug 23, 2024
Merged

feat: refactoring LruCacheLayer with list_with_metakey and concurrent_stat_in_list #4596

Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4d149b9
use list_with_metakey and concurrent_stat_in_list
Aug 20, 2024
c1cec46
Merge branch 'main' into rewrite_cache
Aug 20, 2024
8c3adc9
change concurrent in recover_cache like before
Aug 20, 2024
9ddfa7d
remove stat funcation
Aug 21, 2024
9f400b8
use 8 concurrent
Aug 21, 2024
4335f31
use const value
Aug 21, 2024
962b56c
Merge branch 'main' into rewrite_cache
ozewr Aug 21, 2024
ff88765
fmt code
Aug 23, 2024
ba7dddc
Merge branch 'main' into rewrite_cache
ozewr Aug 23, 2024
b5107a9
Apply suggestions from code review
WenyXu Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions src/object-store/src/layers/lru_cache/read_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ use common_telemetry::debug;
use futures::FutureExt;
use moka::future::Cache;
use moka::notification::ListenerFuture;
use opendal::raw::oio::{List, Read, Reader, Write};
use opendal::raw::{Access, OpDelete, OpList, OpRead, OpStat, OpWrite, RpRead};
use opendal::{Error as OpendalError, ErrorKind, Result};
use opendal::raw::oio::{Read, Reader, Write};
use opendal::raw::{Access, OpDelete, OpRead, OpStat, OpWrite, RpRead};
use opendal::{Error as OpendalError, ErrorKind, Metakey, OperatorBuilder, Result};

use crate::metrics::{
OBJECT_STORE_LRU_CACHE_BYTES, OBJECT_STORE_LRU_CACHE_ENTRIES, OBJECT_STORE_LRU_CACHE_HIT,
OBJECT_STORE_LRU_CACHE_MISS, OBJECT_STORE_READ_ERROR,
};

const RECOVER_CACHE_CONCURRENT: usize = 8;
ozewr marked this conversation as resolved.
Show resolved Hide resolved
WenyXu marked this conversation as resolved.
Show resolved Hide resolved
/// Cache value for read file
#[derive(Debug, Clone, PartialEq, Eq, Copy)]
enum ReadResult {
Expand Down Expand Up @@ -142,19 +142,16 @@ impl<C: Access> ReadCache<C> {
/// Recover existing cache items from `file_cache` to `mem_cache`.
/// Return entry count and total approximate entry size in bytes.
pub(crate) async fn recover_cache(&self) -> Result<(u64, u64)> {
let (_, mut pager) = self.file_cache.list("/", OpList::default()).await?;

while let Some(entry) = pager.next().await? {
let op = OperatorBuilder::new(self.file_cache.clone()).finish();
let mut entries = op
.list_with("/")
.metakey(Metakey::ContentLength | Metakey::ContentType)
.concurrent(RECOVER_CACHE_CONCURRENT)
WenyXu marked this conversation as resolved.
Show resolved Hide resolved
.await?;

while let Some(entry) = entries.pop() {
let read_key = entry.path();

// We can't retrieve the metadata from `[opendal::raw::oio::Entry]` directly,
// because it's private field.
let size = {
let stat = self.file_cache.stat(read_key, OpStat::default()).await?;

stat.into_metadata().content_length()
};

let size = entry.metadata().content_length();
OBJECT_STORE_LRU_CACHE_ENTRIES.inc();
OBJECT_STORE_LRU_CACHE_BYTES.add(size as i64);
self.mem_cache
Expand Down