tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,600 Commits 2 Branches 54 Tags 14 MiB
84677c7e8a
Commit Graph

1465 Commits

Author SHA1 Message Date
Dietmar Maurer
89245fb530 renamed: src/backup/catalog_blob.rs -> src/backup/catalog.rs 2019-11-08 10:41:00 +01:00
Dietmar Maurer
bf6e321744 change catalog format, use dynamic index to store catalog. 
In order to remove size restriction of a single blob.
 2019-11-08 10:35:48 +01:00
Dietmar Maurer
e016f9ff2f src/client/backup_writer.rs: rename force_close to cancel 
And do not consume self.
 2019-11-08 10:34:16 +01:00
Dietmar Maurer
0997967d65 do no restrict index names too much 2019-11-08 10:28:14 +01:00
Christian Ebner
e66621182b src/pxar/decoder.rs: impl lookup for Decoder 
Allows to lookup an entry in a directory based on the provided `DirectoryEntry`.
This is needed to navigate the filesystem based on `DirectoryEntry`s and similar
to the find_goodbye_entry() function in src/pxar/fuse.rs

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-11-06 10:00:41 +01:00
Christian Ebner
fb2554de29 src/pxar/decoder.rs: fix wrong filename check for Decoder::restore() 
As it turns out the original implementation was correct and the start in
`DirectoryEntry` points to the `PxarEntry` and not as wrongly stated to the
filename.
This reverts the incorrect code and adds comments to the fields clarifying this.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-11-06 09:59:35 +01:00
Christian Ebner
33ad183a40 src/pxar/decoder.rs: allow to pass match pattern to restore 
In order to partially restore the archive starting from the directory provided as
parameter.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-11-05 14:19:09 +01:00
Christian Ebner
5e8d600c71 src/pxar/decoder.rs: fix issue with restore 
`Decoder::restore()` calls the `SequentialDecoder::restore()` which expects to
encounter a `PxarEntry` at first. But the start of `DirectoryEntry` points to the
filename (except for the root dir), so skip over it.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-11-05 14:18:29 +01:00
Christian Ebner
9708b2d98c src/pxar/fuse.rs: refactor Iterator: use find() instead of position() 
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-11-04 13:59:16 +01:00
Christian Ebner
b82a101c86 catalog: store current writer position in CatalogBlobWriter 
Counts the bytes written by the CatalogBlobWriter in order to obtain the
stream position, needed to get offset to reference catalog items.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-10-31 09:11:51 +01:00
Dietmar Maurer
62ee2eb405 avoid some clippy warnings 2019-10-26 11:42:05 +02:00
Dietmar Maurer
834a2f95a0 avoid some clippy warnings 2019-10-25 18:44:51 +02:00
Dietmar Maurer
f58f426e86 src/pxar/binary_search_tree.rs: allow(clippy::many_single_char_names) 2019-10-25 18:22:19 +02:00
Dietmar Maurer
11377a47bb avoid some clippy warnings 2019-10-25 18:04:37 +02:00
Dietmar Maurer
9fe2f639b8 allow(clippy::cast_ptr_alignment) 2019-10-25 18:03:55 +02:00
Dietmar Maurer
cd69d36b45 src/backup/dynamic_index.rs: use write_all() 2019-10-25 17:22:41 +02:00
Christian Ebner
8abd12f1f3 pxar: decoder: cleanup un-needed Decoder::get_dir() 
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-10-23 08:02:23 +02:00
Christian Ebner
9c25c0330a pxar: fuse: optimize fuse readdir callback 
The expensive call to Decoder::read_directory_entry() can be omitted as
Decoder::attributes() returns all the information the fuse response needs.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-10-23 08:02:03 +02:00
Dietmar Maurer
ffe171c5db src/pxar/encoder.rs: avoid duplicate check for MAX_DIRECTORY_ENTRIES 
Simply by reordering code.
 2019-10-23 07:55:56 +02:00
Christian Ebner
62d123e50a pxar: add functionality to pass exclude MatchPatterns on create 
This exposes the option to pass a list of exclude MatchPattern via the
'--exclude' option.
The list is encoded as file '.pxarexclude-cli' in the archives root directory.
If such a file is present in the filesystem, it is skipped and not included in
the archive in order to avoid conflicting information.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-10-23 07:31:49 +02:00
Christian Ebner
ba8165c607 pxar: encoder: add encode_pxar_exclude_cli() function. 
This provides the functionality needed to encode MatchPatterns passed on the cli
in the root directory.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-10-23 07:30:30 +02:00
Dietmar Maurer
920243b12d pxar: simplify MatchPattern::to_bytes 2019-10-23 07:29:02 +02:00
Christian Ebner
e50a90e010 pxar: Implement to_bytes() for MatchPattern in order to write them to file. 
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-10-23 07:21:11 +02:00
Dietmar Maurer
a8f10f849e src/bin/proxmox-backup-client.rs: fix parameters for get_encryption_key_password 2019-10-17 10:28:21 +02:00
Christian Ebner
40c9ff9d81 src/pxar/encoder.rs: include .pxarexclude files into the catalog 
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-10-17 10:25:20 +02:00
Christian Ebner
20feec9fac pxar: fuse: include nsec information in stat 
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 2019-10-17 10:24:13 +02:00
Dietmar Maurer
649c5ee7b1 load_and_decrtypt_key: allow function closures to readf passphrase 2019-10-16 13:23:52 +02:00
Dietmar Maurer
60ffa9649c src/backup/manifest.rs: fix property names (use '-' instead of '_') 2019-10-14 12:28:27 +02:00
Dietmar Maurer
4c9f753c56 src/backup/data_blob.rs: define create_zero_chunk as member function 
and rename it to build_zero_chunk()
 2019-10-14 10:58:26 +02:00
Dietmar Maurer
2745151d93 src/backup/data_blob.rs: add create_zero_chunk() helper 2019-10-14 10:44:46 +02:00
Dietmar Maurer
f06b820ac0 src/backup/manifest.rs: add verify_file 2019-10-13 10:09:12 +02:00
Dietmar Maurer
511a47bd73 cleanup 2019-10-13 09:39:21 +02:00
Dietmar Maurer
e17d5d864d src/backup/manifest.rs: improve parser (try_from) 2019-10-13 08:39:49 +02:00
Dietmar Maurer
59e9ba01c6 src/backup/manifest.rs: new class to generate/parse index.json 2019-10-12 17:58:08 +02:00
Dietmar Maurer
ad6e5a6f51 rename INDEX_BLOB_NAME to MANIFEST_BLOB_NAME 2019-10-12 15:53:27 +02:00
Dietmar Maurer
296c50ba3d src/client/backup_reader.rs: add download_manifest 
Also add crypt_config as member variable.
 2019-10-12 15:50:26 +02:00
Dietmar Maurer
cf9271e27c src/client/backup_writer.rs: move BackupClient code into extra file 
And rename it to BackupWriter.
 2019-10-12 13:53:11 +02:00
Dietmar Maurer
913acb41fd src/client/backup_reader.rs: add documentation 2019-10-12 13:26:47 +02:00
Dietmar Maurer
9e490a7479 src/client/backup_reader.rs: split BackupReader code into separate file 2019-10-12 12:57:08 +02:00
Dietmar Maurer
fd04ca7a5a src/bin/proxmox-backup-client.rs: pass verbose flag to dump_image 
And print some useful status to stderr.
 2019-10-09 12:04:02 +02:00
Dietmar Maurer
2c2097ee75 fix typo in error message 2019-10-07 12:48:56 +02:00
Dietmar Maurer
f7aa6f15d3 src/api2/reader.rs: use tokio::fs::read() to read file async 2019-10-07 12:24:06 +02:00
Dietmar Maurer
7123ff7d43 src/backup/data_blob.rs: avoid Arc<CryptConfig> 
use simple reference instead.
 2019-10-07 11:41:35 +02:00
Dietmar Maurer
4ee8f53d07 remove DataChunk file format - use DataBlob instead 2019-10-06 10:31:06 +02:00
Dietmar Maurer
c26d4b4573 cleanup: remove dead code 2019-10-05 16:10:41 +02:00
Dietmar Maurer
88892ea801 src/bin/proxmox-backup-client.rs: cleanup restore 
- write directly to /dev/stdout (instead of using stdout line writer)
- avoid BufferedFixedReader
 2019-10-05 11:52:12 +02:00
Dietmar Maurer
62e05bb3b3 src/client/remote_chunk_reader.rs: pass reference to download_chunk 
Make sure we do not move data around.
 2019-10-05 11:45:20 +02:00
Dietmar Maurer
c0b1b14c05 src/api2/reader.rs - download_chunk: use blocking io 
Turns out to be twice as fast as tokio async io...
 2019-10-05 11:41:19 +02:00
Dietmar Maurer
ff01c1e393 src/client/http_client.rs: store raw data/blob size in index.json 2019-10-02 10:54:06 +02:00
Dietmar Maurer
f16aea687a src/client/http_client.rs: new helper send_upload_request() 2019-09-28 18:22:48 +02:00