rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-05-18 14:00:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: object store caching bug, #1466 (#1467)

Browse Source 
* fix: object store caching bug, #1466

* fix: forgot to add S3WithCache tests
This commit is contained in:
dennis zhuang
2023-04-25 21:48:51 +08:00
committed by GitHub
parent 197c34bc17
commit 8d8a480dc1
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/object-store/src/cache_policy.rs
View File

@@ -93,7 +93,7 @@ impl<I: Accessor, C: Accessor> LayeredAccessor for LruCacheAccessor<I, C> {
let cache_path = self.cache_path(&path, &args);
let lru_cache = self.lru_cache.clone();
match self.cache.read(&cache_path, OpRead::default()).await {
match self.cache.read(&cache_path, args.clone()).await {
Ok((rp, r)) => {
increment_counter!(OBJECT_STORE_LRU_CACHE_HIT);
@@ -116,7 +116,7 @@ impl<I: Accessor, C: Accessor> LayeredAccessor for LruCacheAccessor<I, C> {
writer.write(Bytes::from(buf)).await?;
writer.close().await?;
match self.cache.read(&cache_path, OpRead::default()).await {
match self.cache.read(&cache_path, args.clone()).await {
Ok((rp, reader)) => {
let r = {
// push new cache file name to lru

28
tests-integration/src/test_util.rs
View File

@@ -60,8 +60,10 @@ fn get_port() -> usize {
.fetch_add(1, Ordering::Relaxed)
}
#[derive(Debug, Eq, PartialEq)]
pub enum StorageType {
S3,
S3WithCache,
File,
Oss,
}
@@ -72,7 +74,7 @@ impl StorageType {
match self {
StorageType::File => true, // always test file
StorageType::S3 => {
StorageType::S3 | StorageType::S3WithCache => {
if let Ok(b) = env::var("GT_S3_BUCKET") {
!b.is_empty()
} else {
@@ -90,6 +92,16 @@ impl StorageType {
}
}
fn s3_test_config() -> S3Config {
S3Config {
root: uuid::Uuid::new_v4().to_string(),
access_key_id: env::var("GT_S3_ACCESS_KEY_ID").unwrap(),
secret_access_key: env::var("GT_S3_ACCESS_KEY").unwrap(),
bucket: env::var("GT_S3_BUCKET").unwrap(),
..Default::default()
}
}
fn get_test_store_config(
store_type: &StorageType,
name: &str,
@@ -124,14 +136,12 @@ fn get_test_store_config(
Some(TempDirGuard::Oss(TempFolder::new(&store, "/"))),
)
}
StorageType::S3 => {
let s3_config = S3Config {
root: uuid::Uuid::new_v4().to_string(),
access_key_id: env::var("GT_S3_ACCESS_KEY_ID").unwrap(),
secret_access_key: env::var("GT_S3_ACCESS_KEY").unwrap(),
bucket: env::var("GT_S3_BUCKET").unwrap(),
..Default::default()
};
StorageType::S3 | StorageType::S3WithCache => {
let mut s3_config = s3_test_config();
if *store_type == StorageType::S3WithCache {
s3_config.cache_path = Some("/tmp/greptimedb_cache".to_string());
}
let mut builder = S3::default();
builder

4
tests-integration/tests/main.rs
View File

@@ -17,5 +17,5 @@ mod grpc;
#[macro_use]
mod http;
grpc_tests!(File, S3, Oss);
http_tests!(File, S3, Oss);
grpc_tests!(File, S3, S3WithCache, Oss);
http_tests!(File, S3, S3WithCache, Oss);