rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-31 03:50:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustfmt

Browse Source
This commit is contained in:
Heikki Linnakangas
2022-11-24 12:25:19 +02:00
committed by Christian Schwarz
parent 39b10696e9
commit 50b686c3e4
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pageserver/src/tenant.rs
View File

@@ -724,10 +724,7 @@ impl Tenant {
}
/// Create a placeholder Tenant object for a broken tenant
pub fn create_broken_tenant(
conf: &'static PageServerConf,
tenant_id: TenantId,
) -> Arc<Tenant> {
pub fn create_broken_tenant(conf: &'static PageServerConf, tenant_id: TenantId) -> Arc<Tenant> {
let wal_redo_manager = Arc::new(PostgresRedoManager::new(conf, tenant_id));
let tenant = Arc::new(Tenant::new(
TenantState::Broken,
@@ -739,7 +736,7 @@ impl Tenant {
));
tenant
}
///
/// Load a tenant that's available on local disk
///
@@ -1281,14 +1278,16 @@ impl Tenant {
}
TenantState::Broken => {
// This shouldn't happen either
result = Err(anyhow::anyhow!("Could not activate tenant because it is in broken state"));
result = Err(anyhow::anyhow!(
"Could not activate tenant because it is in broken state"
));
}
TenantState::Paused => {
// The tenant was detached, or system shutdown was requested, while we were
// loading or attaching the tenant.
info!("Tenant is already in Paused state, skipping activation");
}
TenantState::Loading | TenantState::Attaching => {
TenantState::Loading | TenantState::Attaching => {
*current_state = TenantState::Active;
let timelines_accessor = self.timelines.lock().unwrap();
@@ -1309,7 +1308,6 @@ impl Tenant {
result
}
/// Change tenant status to paused, to mark that it is being shut down
pub fn set_paused(&self) {
self.state.send_modify(|current_state| {
@@ -1361,7 +1359,7 @@ impl Tenant {
*current_state = TenantState::Broken;
warn!("Marking Paused tenant as Broken");
}
TenantState::Loading | TenantState::Attaching => {
TenantState::Loading | TenantState::Attaching => {
*current_state = TenantState::Broken;
}
}
@@ -2229,7 +2227,6 @@ fn remove_timeline_and_uninit_mark(timeline_dir: &Path, uninit_mark: &Path) -> a
Ok(())
}
fn create_tenant_files(
conf: &'static PageServerConf,
tenant_conf: TenantConfOpt,

9
pageserver/src/tenant_mgr.rs
View File

@@ -209,12 +209,8 @@ pub fn create_tenant(
Ok(None)
}
hash_map::Entry::Vacant(v) => {
let tenant = Tenant::create_tenant(
conf,
tenant_conf,
tenant_id,
remote_storage.cloned(),
)?;
let tenant =
Tenant::create_tenant(conf, tenant_conf, tenant_id, remote_storage.cloned())?;
v.insert(tenant);
Ok(Some(tenant_id))
}
@@ -285,7 +281,6 @@ pub async fn detach_tenant(
conf: &'static PageServerConf,
tenant_id: TenantId,
) -> anyhow::Result<()> {
let tenant = match {
let mut tenants_accessor = tenants_state::write_tenants();
tenants_accessor.remove(&tenant_id)