Commit graph

825 commits

Author SHA1 Message Date
Thomas Waldmann
b1bca71483 Merge branch 'merge' into merge-all 2015-05-10 16:40:22 +02:00
Thomas Waldmann
f9d90482c4 merged master 2015-05-10 16:36:10 +02:00
Jonas Borgström
a24d0f4cba Fix typo preventing the security confirmation prompt from working
Closes #303
2015-05-08 17:41:50 +02:00
Jonas Borgström
c79b5357f8 Improve installatoin instructions.
Specifically refer to pip3 instead of pip to avoid potential
confusion.

Also mention virtualenv
2015-04-27 22:35:06 +02:00
Thomas Waldmann
6c615dd0a8 Merge branch 'merge' into merge-all 2015-04-27 00:49:10 +02:00
Thomas Waldmann
ca385e5e7a Merge branch 'sparse_files' into merge 2015-04-27 00:48:28 +02:00
Thomas Waldmann
5fcaac1b6f do not test for sparse file on Mac OS X 2015-04-27 00:48:09 +02:00
Jonas Borgström
64e8ea72ac Improve handling of systems with improperly configured file system encoding
Closes #289
2015-04-21 22:29:10 +02:00
Thomas Waldmann
f15b73488b Merge branch 'merge' into merge-all 2015-04-21 21:08:34 +02:00
Thomas Waldmann
354b3d34e3 Merge branch 'master' into merge 2015-04-21 21:02:42 +02:00
Thomas Waldmann
a44eecb05e Merge branch 'issue_183' into merge 2015-04-21 20:51:17 +02:00
Thomas Waldmann
38dd086e30 Revert "fix "attic info" all archives stats, fixes #183"
Fixed by jborg in master in a different way.

This reverts commit 212777d716.
2015-04-21 20:50:19 +02:00
Thomas Waldmann
c376ff24d9 Merge branch 'merge' into merge-all 2015-04-21 11:34:28 +02:00
Thomas Waldmann
bbe200f41b fix incomplete merge of delete_repo branch 2015-04-21 11:34:13 +02:00
Jonas Borgström
ed9475d7cd Fix cache object reference 2015-04-20 00:07:26 +02:00
Jonas Borgström
29646a646d Merge pull request #258 from ThomasWaldmann/platform_linux_optimize
linux: remove duplicate os.fsencode calls
2015-04-20 00:05:12 +02:00
Jonas Borgström
35458ff5d6 Merge pull request #288 from ThomasWaldmann/no_os.uname
use sys.platform everywhere, fixes #188
2015-04-20 00:01:02 +02:00
Thomas Waldmann
80dad2df61 use sys.platform everywhere, fixes #188
os.uname is UNIX-only, sys.platform is portable.

note:
- this doesn't implicate attic will now work on windows.
- windows is untested / unsupported and there might be a lot of other issues left.
- attic's xattr module already used sys.platform, so this is better for internal consistency also.
2015-04-19 23:54:44 +02:00
Jonas Borgström
dd0c69ac32 Fix "All archives" output for attic info
Closes #183
2015-04-19 23:45:05 +02:00
Jonas Borgström
04d50c7141 Removed some unused imports 2015-04-19 23:24:14 +02:00
Jonas Borgström
b7e6efbfc5 Added missing import of parse_timestamp 2015-04-19 23:21:46 +02:00
Jonas Borgström
b61ba51c0d More user friendly error message when repository key file is not found
Closes #236
2015-04-19 23:09:36 +02:00
Jonas Borgström
af9f1c24c4 Fix parsing of iso8601 timestamps with zero microseconds
Closes #282
2015-04-19 22:42:52 +02:00
Thomas Waldmann
f30ecf338e updated CHANGES-merge-all.txt 2015-04-19 20:25:37 +02:00
Thomas Waldmann
cc8c3765e4 Merge branch 'merge' into merge-all 2015-04-19 19:57:12 +02:00
Thomas Waldmann
b2147c14d6 updated CHANGES-merge.txt 2015-04-19 19:56:48 +02:00
Thomas Waldmann
1cafd12e19 Merge branch 'merge' into merge-all 2015-04-19 19:06:59 +02:00
Thomas Waldmann
82681d6ecb PR #287 - Merge branch 'issue_183' into merge 2015-04-19 18:54:19 +02:00
Thomas Waldmann
212777d716 fix "attic info" all archives stats, fixes #183
the problem was that calc_stats() dirties cache.chunks by decrementing
the chunk reference counters (so it can compute the deduplicated size
of the archive correctly).

the fix is to create a local Cache instance inside calc_stats, so the dirty cache
instance can not be used elsewhere.

also:
fix internal consistency of calc_stats function: always use "cache" (not "self.cache").
minor cosmetic pep8 fixes
2015-04-19 18:50:10 +02:00
Thomas Waldmann
2fcd1131bb Merge branch 'merge' into merge-all 2015-04-18 21:44:54 +02:00
Thomas Waldmann
310f9b7412 PR #285 - Merge branch 'archive_timestamp' into merge 2015-04-18 21:43:47 +02:00
Thomas Waldmann
0ffee1f1ee implement --timestamp, iso8601-like utc timestamp string or reference file/dir
note: this needs bug #282 to be fixed first, because it will create timestamps with microseconds==0.
2015-04-18 21:36:10 +02:00
Thomas Waldmann
840eacbeeb Merge branch 'merge' into merge-all 2015-04-18 01:17:24 +02:00
Thomas Waldmann
99d15157d2 PR #284 updated - Merge branch 'sparse_files' into merge 2015-04-18 01:16:26 +02:00
Thomas Waldmann
ee80db4eb2 add commandline argument --sparse
default is to not create sparse files.

if you give --sparse, it will create a hole in the sparse output file when a all-zero chunk is extracted.
2015-04-17 22:28:40 +02:00
Thomas Waldmann
fc7e4894d5 Merge branch 'blosc' into merge-all 2015-04-15 23:20:01 +02:00
Thomas Waldmann
e01fbf9412 remove blosc pull from github, use 1.2.5 pypi release 2015-04-15 23:18:53 +02:00
Thomas Waldmann
1b31b9178f Merge branch 'merge' into merge-all 2015-04-15 23:08:53 +02:00
Thomas Waldmann
fc97099924 Merge branch 'master' into merge 2015-04-15 23:04:34 +02:00
Jonas Borgström
e815d6da8e acl/xattr: Be less strict about unknown platforms
Closes #239
2015-04-15 21:49:03 +02:00
Jonas Borgström
848666e7cb cache: Treat EOFError as a negative _confirm answer 2015-04-15 21:35:56 +02:00
Thomas Waldmann
3d1033cb0b Merge branch 'merge' into merge-all 2015-04-15 19:06:48 +02:00
Thomas Waldmann
118fb1a55c PR #226 - Merge branch 'delete_repo' into merge 2015-04-15 19:05:58 +02:00
Thomas Waldmann
2d148750e1 fix BufferFull msgpack exception
now that a unittest produced the maximum chunk size possible, it crashed and
made clear that the unpacker limits were not yet correct.
giving the unpacker now a buffer of CHUNK_MAX + 1000 (the latter is a generous
amount for the little chunk metadata we have).
2015-04-15 17:21:52 +02:00
Thomas Waldmann
84fd300363 Merge branch 'merge' into merge-all 2015-04-15 16:43:46 +02:00
Thomas Waldmann
b6ed1c742b PR #284 - Merge branch 'sparse_files' into merge 2015-04-15 16:43:07 +02:00
Thomas Waldmann
a2bf2aea22 simple sparse file support, made chunk buffer size flexible
Implemented sparse file support to remove this blocker for people backing up lots of
huge sparse files (like VM images). Attic could not support this use case yet as it would
have restored all files to their fully expanded size, possibly running out of disk space if
the total expanded size would be bigger than the available space.

Please note that this is a very simple implementation of sparse file support - at backup time,
it does not do anything special (it just reads all these zero bytes, chunks, compresses and
encrypts them as usual). At restore time, it detects chunks that are completely filled with zeros
and does a seek on the output file rather than a normal data write, so it creates a hole in
a sparse file. The chunk size for these all-zero chunks is currently 10MiB, so it'll create holes
of multiples of that size (depends also a bit on fs block size, alignment, previously written data).

Special cases like sparse files starting and/or ending with a hole are supported.

Please note that it will currently always create sparse files at restore time if it detects all-zero
chunks.

Also improved:
I needed a constant for the max. chunk size, so I introduced CHUNK_MAX (see also
existing CHUNK_MIN) for the maximum chunk size (which is the same as the chunk
buffer size).

Attic still always uses 10MiB chunk buffer size now, but it could be changed now more easily.
2015-04-15 16:29:18 +02:00
Thomas Waldmann
b0cb5ec95e Merge branch 'merge' into merge-all 2015-04-15 03:28:28 +02:00
Thomas Waldmann
2f71b39866 PR #283 - Merge branch 'fix-missing-microseconds' of https://github.com/camh-/attic into merge 2015-04-15 03:06:50 +02:00
Thomas Waldmann
6b7563b909 Merge branch 'merge' into merge-all 2015-04-15 02:51:06 +02:00