//use crate::server::rest::*;
use serde_json::{json, Value};
use std::collections::{HashSet, HashMap};
-use chrono::{DateTime, Datelike, Local, TimeZone};
+use chrono::{DateTime, Datelike, Local};
use std::path::PathBuf;
use std::sync::Arc;
use crate::config::datastore;
use crate::backup::*;
+use crate::server::WorkerTask;
-mod catar;
+mod pxar;
+mod upload;
fn group_backups(backup_list: Vec<BackupInfo>) -> HashMap<String, Vec<BackupInfo>> {
let mut group_hash = HashMap::new();
for info in backup_list {
- let group_id = info.backup_dir.group.group_path().to_str().unwrap().to_owned();
+ let group_id = info.backup_dir.group().group_path().to_str().unwrap().to_owned();
let time_list = group_hash.entry(group_id).or_insert(vec![]);
time_list.push(info);
}
){
let mut hash = HashSet::new();
for info in list {
- let local_time = info.backup_dir.backup_time.with_timezone(&Local);
+ let local_time = info.backup_dir.backup_time().with_timezone(&Local);
if hash.len() >= keep as usize { break; }
let backup_id = info.backup_dir.relative_path();
let sel_id: String = select_id(local_time, &info);
for (_group_id, mut list) in group_hash {
- list.sort_unstable_by(|a, b| b.backup_dir.backup_time.cmp(&a.backup_dir.backup_time)); // new backups first
+ BackupInfo::sort_list(&mut list, false);
let info = &list[0];
- let group = &info.backup_dir.group;
+ let group = info.backup_dir.group();
groups.push(json!({
- "backup-type": group.backup_type,
- "backup-id": group.backup_id,
- "last-backup": info.backup_dir.backup_time.timestamp(),
+ "backup-type": group.backup_type(),
+ "backup-id": group.backup_id(),
+ "last-backup": info.backup_dir.backup_time().timestamp(),
"backup-count": list.len() as u64,
"files": info.files,
}));
Ok(json!(groups))
}
+fn list_snapshot_files (
+ param: Value,
+ _info: &ApiMethod,
+ _rpcenv: &mut RpcEnvironment,
+) -> Result<Value, Error> {
+
+ let store = tools::required_string_param(¶m, "store")?;
+ let backup_type = tools::required_string_param(¶m, "backup-type")?;
+ let backup_id = tools::required_string_param(¶m, "backup-id")?;
+ let backup_time = tools::required_integer_param(¶m, "backup-time")?;
+
+ let snapshot = BackupDir::new(backup_type, backup_id, backup_time);
+
+ let datastore = DataStore::lookup_datastore(store)?;
+
+ let files = datastore.list_files(&snapshot)?;
+
+ Ok(json!(files))
+}
+
fn delete_snapshots (
param: Value,
_info: &ApiMethod,
let backup_type = tools::required_string_param(¶m, "backup-type")?;
let backup_id = tools::required_string_param(¶m, "backup-id")?;
let backup_time = tools::required_integer_param(¶m, "backup-time")?;
- let backup_time = Local.timestamp(backup_time, 0);
-
- let snapshot = BackupDir {
- group: BackupGroup {
- backup_type: backup_type.to_owned(),
- backup_id: backup_id.to_owned(),
- },
- backup_time,
- };
+
+ let snapshot = BackupDir::new(backup_type, backup_id, backup_time);
let datastore = DataStore::lookup_datastore(store)?;
let backup_type = tools::required_string_param(¶m, "backup-type")?;
let backup_id = tools::required_string_param(¶m, "backup-id")?;
- let group = BackupGroup {
- backup_type: backup_type.to_owned(),
- backup_id: backup_id.to_owned(),
- };
+ let group = BackupGroup::new(backup_type, backup_id);
let datastore = DataStore::lookup_datastore(store)?;
let group_snapshots = match group_hash.get_mut(&group_id) {
Some(data) => {
// new backups first
- data.sort_unstable_by(|a, b| b.backup_dir.backup_time.cmp(&a.backup_dir.backup_time));
+ BackupInfo::sort_list(data, false);
data
}
None => bail!("Backup group '{}' does not exists.", group_id),
for info in group_snapshots {
- let group = &info.backup_dir.group;
+ let group = info.backup_dir.group();
snapshots.push(json!({
- "backup-type": group.backup_type,
- "backup-id": group.backup_id,
- "backup-time": info.backup_dir.backup_time.timestamp(),
+ "backup-type": group.backup_type(),
+ "backup-id": group.backup_id(),
+ "backup-time": info.backup_dir.backup_time().timestamp(),
"files": info.files,
}));
}
let mut mark = HashSet::new();
- list.sort_unstable_by(|a, b| b.backup_dir.backup_time.cmp(&a.backup_dir.backup_time)); // new backups first
+ BackupInfo::sort_list(&mut list, false);
if let Some(keep_last) = param["keep-last"].as_u64() {
list.iter().take(keep_last as usize).for_each(|info| {
});
}
- let mut remove_list: Vec<&BackupInfo> = list.iter()
+ let mut remove_list: Vec<BackupInfo> = list.into_iter()
.filter(|info| !mark.contains(&info.backup_dir.relative_path())).collect();
- remove_list.sort_unstable_by(|a, b| a.backup_dir.backup_time.cmp(&b.backup_dir.backup_time)); // oldest backups first
+ BackupInfo::sort_list(&mut remove_list, true);
for info in remove_list {
datastore.remove_backup_dir(&info.backup_dir)?;
)
}
-// this is just a test for mutability/mutex handling - will remove later
fn start_garbage_collection(
param: Value,
_info: &ApiMethod,
- _rpcenv: &mut RpcEnvironment,
+ rpcenv: &mut RpcEnvironment,
) -> Result<Value, Error> {
- let store = param["store"].as_str().unwrap();
+ let store = param["store"].as_str().unwrap().to_string();
- let datastore = DataStore::lookup_datastore(store)?;
+ let datastore = DataStore::lookup_datastore(&store)?;
println!("Starting garbage collection on store {}", store);
- datastore.garbage_collection()?;
+ let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false };
- Ok(json!(null))
+ let upid_str = WorkerTask::new_thread(
+ "garbage_collection", Some(store.clone()), "root@pam", to_stdout, move |worker|
+ {
+ worker.log(format!("starting garbage collection on store {}", store));
+ datastore.garbage_collection()
+ })?;
+
+ Ok(json!(upid_str))
}
pub fn api_method_start_garbage_collection() -> ApiMethod {
for info in datastore.list_backups()? {
list.push(json!({
- "backup-type": info.backup_dir.group.backup_type,
- "backup-id": info.backup_dir.group.backup_id,
- "backup-time": info.backup_dir.backup_time.timestamp(),
+ "backup-type": info.backup_dir.group().backup_type(),
+ "backup-id": info.backup_dir.group().backup_id(),
+ "backup-time": info.backup_dir.backup_time().timestamp(),
"files": info.files,
}));
}
.get(ApiMethod::new(
|_,_,_| Ok(json!([
{"subdir": "backups" },
- {"subdir": "catar" },
+ {"subdir": "pxar" },
{"subdir": "gc" },
{"subdir": "groups" },
{"subdir": "snapshots" },
ObjectSchema::new("List backups.")
.required("store", store_schema.clone()))))
.subdir(
- "catar",
+ "pxar",
Router::new()
- .download(catar::api_method_download_catar())
- .upload(catar::api_method_upload_catar()))
+ .download(pxar::api_method_download_pxar())
+ .upload(pxar::api_method_upload_pxar()))
+ .subdir(
+ "test-upload",
+ Router::new()
+ .upgrade(upload::api_method_upgrade_upload()))
.subdir(
"gc",
Router::new()
.get(api_method_garbage_collection_status())
.post(api_method_start_garbage_collection()))
+ .subdir(
+ "files",
+ Router::new()
+ .get(
+ ApiMethod::new(
+ list_snapshot_files,
+ ObjectSchema::new("List snapshot files.")
+ .required("store", store_schema.clone())
+ .required("backup-type", StringSchema::new("Backup type."))
+ .required("backup-id", StringSchema::new("Backup ID."))
+ .required("backup-time", IntegerSchema::new("Backup time (Unix epoch.)")
+ .minimum(1547797308))
+ )
+ )
+ )
.subdir(
"groups",
Router::new()
projects / proxmox-backup.git / blobdiff