tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup proxmox_backup::backup module

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2021-08-30 11:49:22 +02:00
parent 97dfc62f0d
commit b2065dc7d2
33 changed files with 128 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/api2/admin/datastore.rs
View File

@ -26,15 +26,37 @@ use proxmox::{http_err, identity, list_subdirs_api_method, sortable};
use pxar::accessor::aio::Accessor;
use pxar::EntryKind;
use pbs_api_types::{
Authid, BackupContent, Counts, CryptMode, DataStoreListItem, GarbageCollectionStatus,
GroupListItem, SnapshotListItem, SnapshotVerifyState, BACKUP_ARCHIVE_NAME_SCHEMA,
BACKUP_ID_SCHEMA, BACKUP_TIME_SCHEMA, BACKUP_TYPE_SCHEMA, DATASTORE_SCHEMA,
};
use pbs_client::pxar::create_zip;
use pbs_datastore::{BackupDir, BackupGroup, StoreProgress, CATALOG_NAME};
use pbs_datastore::backup_info::BackupInfo;
use pbs_datastore::cached_chunk_reader::CachedChunkReader;
use pbs_datastore::catalog::CatalogReader;
use pbs_datastore::data_blob::DataBlob;
use pbs_datastore::data_blob_reader::DataBlobReader;
use pbs_datastore::dynamic_index::{BufferedDynamicReader, DynamicIndexReader, LocalDynamicReadAt};
use pbs_datastore::fixed_index::{FixedIndexReader};
use pbs_datastore::index::IndexFile;
use pbs_datastore::manifest::{BackupManifest, CLIENT_LOG_BLOB_NAME, MANIFEST_BLOB_NAME};
use pbs_datastore::prune::{compute_prune_info, PruneOptions};
use pbs_tools::blocking::WrappedReaderStream;
use pbs_tools::stream::{AsyncReaderStream, AsyncChannelWriter};
use pbs_tools::json::{required_integer_param, required_string_param};
use crate::api2::types::*;
use crate::api2::types::{
ArchiveEntry, DataStoreStatus, RRDMode, RRDTimeFrameResolution,
IGNORE_VERIFIED_BACKUPS_SCHEMA, UPID_SCHEMA, VERIFICATION_OUTDATED_AFTER_SCHEMA
};
use crate::api2::node::rrd::create_value_from_rrd;
use crate::api2::helpers;
use crate::backup::*;
use crate::backup::{
check_backup_owner, verify_all_backups, verify_backup_group, verify_backup_dir, verify_filter,
DataStore, LocalChunkReader,
};
use crate::config::datastore;
use crate::config::cached_user_info::CachedUserInfo;

7
src/api2/backup/environment.rs
View File

@ -10,8 +10,13 @@ use proxmox::tools::digest_to_hex;
use proxmox::tools::fs::{replace_file, CreateOptions};
use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
use pbs_datastore::DataBlob;
use pbs_datastore::backup_info::{BackupDir, BackupInfo};
use pbs_datastore::dynamic_index::DynamicIndexWriter;
use pbs_datastore::fixed_index::FixedIndexWriter;
use crate::api2::types::Authid;
use crate::backup::*;
use crate::backup::{verify_backup_dir_with_lock, DataStore};
use crate::server::WorkerTask;
use crate::server::formatter::*;
use hyper::{Body, Response};

5
src/api2/backup/mod.rs
View File

@ -15,9 +15,12 @@ use proxmox::api::schema::*;
use pbs_tools::fs::lock_dir_noblock_shared;
use pbs_tools::json::{required_array_param, required_integer_param, required_string_param};
use pbs_datastore::PROXMOX_BACKUP_PROTOCOL_ID_V1;
use pbs_datastore::backup_info::{BackupDir, BackupGroup, BackupInfo};
use pbs_datastore::index::IndexFile;
use pbs_datastore::manifest::{archive_type, ArchiveType};
use crate::server::{WorkerTask, H2Service};
use crate::backup::*;
use crate::backup::DataStore;
use crate::api2::types::*;
use crate::config::acl::PRIV_DATASTORE_BACKUP;
use crate::config::cached_user_info::CachedUserInfo;

4
src/api2/backup/upload_chunk.rs
View File

@ -12,10 +12,12 @@ use proxmox::{sortable, identity};
use proxmox::api::{ApiResponseFuture, ApiHandler, ApiMethod, RpcEnvironment};
use proxmox::api::schema::*;
use pbs_datastore::DataBlob;
use pbs_datastore::file_formats::{DataBlobHeader, EncryptedDataBlobHeader};
use pbs_tools::json::{required_integer_param, required_string_param};
use crate::api2::types::*;
use crate::backup::*;
use crate::backup::DataStore;
use super::environment::*;

4
src/api2/config/datastore.rs
View File

@ -7,6 +7,8 @@ use ::serde::{Deserialize, Serialize};
use proxmox::api::{api, Router, RpcEnvironment, Permission};
use proxmox::api::section_config::SectionConfigData;
use proxmox::api::schema::{ApiType, parse_property_string};
use pbs_datastore::chunk_store::ChunkStore;
use pbs_datastore::task::TaskState;
use crate::api2::config::sync::delete_sync_job;
@ -17,7 +19,7 @@ use crate::api2::admin::{
verify::list_verification_jobs,
};
use crate::api2::types::*;
use crate::backup::*;
use crate::backup::BackupLockGuard;
use crate::config::cached_user_info::CachedUserInfo;
use crate::config::datastore::{self, DataStoreConfig, DataStoreConfigUpdater};
use crate::config::acl::{PRIV_DATASTORE_ALLOCATE, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_MODIFY};

8
src/api2/config/tape_encryption_keys.rs
View File

@ -11,7 +11,9 @@ use proxmox::{
},
};
use pbs_api_types::Fingerprint;
use pbs_datastore::{KeyInfo, Kdf};
use pbs_datastore::key_derivation::KeyConfig;
use crate::{
config::{
@ -33,11 +35,7 @@ use crate::{
PROXMOX_CONFIG_DIGEST_SCHEMA,
PASSWORD_HINT_SCHEMA,
},
backup::{
open_backup_lockfile,
KeyConfig,
Fingerprint,
},
backup::open_backup_lockfile,
};
#[api(

3
src/api2/helpers.rs
View File

@ -7,8 +7,9 @@ use hyper::{Body, Response, StatusCode, header};
use proxmox::http_bail;
use pbs_datastore::catalog::{CatalogReader, DirEntryAttribute};
use crate::api2::types::ArchiveEntry;
use crate::backup::{CatalogReader, DirEntryAttribute};
pub async fn create_download_response(path: PathBuf) -> Result<Response<Body>, Error> {
let file = match tokio::fs::File::open(path.clone()).await {

4
src/api2/reader/environment.rs
View File

@ -5,8 +5,10 @@ use serde_json::{json, Value};
use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
use pbs_datastore::backup_info::BackupDir;
use crate::api2::types::Authid;
use crate::backup::*;
use crate::backup::DataStore;
use crate::server::formatter::*;
use crate::server::WorkerTask;

11
src/api2/reader/mod.rs
View File

@ -30,6 +30,9 @@ use proxmox::{
use pbs_tools::fs::lock_dir_noblock_shared;
use pbs_tools::json::{required_integer_param, required_string_param};
use pbs_datastore::PROXMOX_BACKUP_READER_PROTOCOL_ID_V1;
use pbs_datastore::backup_info::BackupDir;
use pbs_datastore::index::IndexFile;
use pbs_datastore::manifest::{archive_type, ArchiveType};
use crate::{
api2::{
@ -43,13 +46,7 @@ use crate::{
Authid,
},
},
backup::{
DataStore,
ArchiveType,
BackupDir,
IndexFile,
archive_type,
},
backup::DataStore,
server::{
WorkerTask,
H2Service,

13
src/api2/tape/backup.rs
View File

@ -15,7 +15,9 @@ use proxmox::{
},
};
use pbs_datastore::{task_log, task_warn};
use pbs_api_types::{Authid, Userid};
use pbs_datastore::{task_log, task_warn, StoreProgress};
use pbs_datastore::backup_info::{BackupDir, BackupInfo};
use pbs_datastore::task::TaskState;
use crate::{
@ -42,18 +44,11 @@ use crate::{
compute_schedule_status,
},
},
backup::{
DataStore,
BackupDir,
BackupInfo,
StoreProgress,
},
backup::DataStore,
api2::types::{
Authid,
UPID_SCHEMA,
JOB_ID_SCHEMA,
MediaPoolConfig,
Userid,
},
server::WorkerTask,
tape::{

5
src/api2/tape/media.rs
View File

@ -10,6 +10,8 @@ use proxmox::{
tools::Uuid,
};
use pbs_datastore::backup_info::BackupDir;
use crate::{
config::{
self,
@ -34,9 +36,6 @@ use crate::{
MediaContentEntry,
VAULT_NAME_SCHEMA,
},
backup::{
BackupDir,
},
tape::{
TAPE_STATUS_DIR,
Inventory,

22
src/api2/tape/restore.rs
View File

@ -28,7 +28,13 @@ use proxmox::{
},
};
use pbs_datastore::{task_log, task_warn};
use pbs_api_types::CryptMode;
use pbs_datastore::{task_log, task_warn, DataBlob};
use pbs_datastore::backup_info::BackupDir;
use pbs_datastore::dynamic_index::DynamicIndexReader;
use pbs_datastore::fixed_index::FixedIndexReader;
use pbs_datastore::index::IndexFile;
use pbs_datastore::manifest::{archive_type, ArchiveType, BackupManifest, MANIFEST_BLOB_NAME};
use pbs_datastore::task::TaskState;
use crate::{
@ -51,19 +57,7 @@ use crate::{
PRIV_TAPE_READ,
},
},
backup::{
ArchiveType,
archive_type,
IndexFile,
MANIFEST_BLOB_NAME,
CryptMode,
DataStore,
DynamicIndexReader,
FixedIndexReader,
BackupDir,
DataBlob,
BackupManifest,
},
backup::DataStore,
server::{
lookup_user_email,
WorkerTask,

7
src/api2/types/mod.rs
View File

@ -6,12 +6,9 @@ use serde::{Deserialize, Serialize};
use proxmox::api::{api, schema::*};
use proxmox::const_regex;
use pbs_datastore::catalog::CatalogEntryType;
use pbs_datastore::catalog::{CatalogEntryType, DirEntryAttribute};
use crate::{
backup::DirEntryAttribute,
config::acl::Role,
};
use crate::config::acl::Role;
mod tape;
pub use tape::*;