Skip to content

Store: rewrite the ONTAP store as an adapter over S3Store #2866

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

Open
LakshmirajSunilSawant wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Store: rewrite the ONTAP store as an adapter over S3Store #2866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 3 additions & 31 deletions nativelink-store/src/ontap_s3_existence_cache_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,8 @@ use std::collections::HashSet;
use std::sync::{Arc, Weak};

use async_trait::async_trait;
use aws_config::BehaviorVersion;
use aws_config::default_provider::credentials::DefaultCredentialsChain;
use aws_config::provider_config::ProviderConfig;
use aws_sdk_s3::Client;
use aws_sdk_s3::config::Region;
use nativelink_config::stores::{ExperimentalOntapS3Spec, OntapS3ExistenceCacheSpec};
use nativelink_config::stores::OntapS3ExistenceCacheSpec;
use nativelink_error::{Code, Error, ResultExt, make_err};
use nativelink_metric::MetricsComponent;
use nativelink_util::buf_channel::{DropCloserReadHalf, DropCloserWriteHalf};
Expand All @@ -45,7 +41,6 @@ use tokio::time::{interval, sleep};
use tracing::{Level, debug, event};

use crate::cas_utils::is_zero_digest;
use crate::common_s3_utils::TlsClient;
use crate::ontap_s3_store::OntapS3Store;

#[derive(Serialize, Deserialize)]
Expand Down Expand Up @@ -342,9 +337,8 @@ where

pub async fn new(spec: &OntapS3ExistenceCacheSpec, now_fn: NowFn) -> Result<Arc<Self>, Error> {
let inner_spec = &spec.backend;
let inner_store = Arc::new(OntapS3Store::new(inner_spec, now_fn.clone()).await?);
let inner_store = Store::new((*inner_store).clone());
let s3_client = create_s3_client(inner_spec).await?;
let inner_store = Store::new(OntapS3Store::new(inner_spec, now_fn.clone()).await?);
let s3_client = OntapS3Store::make_client(inner_spec).await?;

let digests = Arc::new(RwLock::new(HashSet::new()));
let last_sync = Arc::new(AtomicU64::new(0));
Expand Down Expand Up @@ -414,28 +408,6 @@ where
}
}

async fn create_s3_client(spec: &ExperimentalOntapS3Spec) -> Result<Client, Error> {
let http_client = TlsClient::new(&spec.common)?;
let credentials_provider = DefaultCredentialsChain::builder()
.configure(
ProviderConfig::without_region()
.with_region(Some(Region::new(Cow::Owned(spec.vserver_name.clone()))))
.with_http_client(http_client.clone()),
)
.build()
.await;

let config = aws_sdk_s3::Config::builder()
.credentials_provider(credentials_provider)
.endpoint_url(&spec.endpoint)
.region(Region::new(spec.vserver_name.clone()))
.force_path_style(true)
.behavior_version(BehaviorVersion::latest())
.build();

Ok(Client::from_conf(config))
}

#[async_trait]
impl<I, NowFn> StoreDriver for OntapS3ExistenceCache<I, NowFn>
where
Expand Down
Loading
Loading