1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 01:37:20 +00:00
Commit graph

5336 commits

Author SHA1 Message Date
TW
e175f8ea53
Merge pull request #4024 from ThomasWaldmann/travis-cleanups
travis: reorder envs, add 3.7-dev
2018-08-09 15:18:44 +02:00
TW
708a65a0b5
Merge pull request #4022 from ThomasWaldmann/finding-pieces-master
some more debug commands (master forward port)
2018-08-09 09:43:57 +02:00
Thomas Waldmann
876d466c55 travis: reorder envs, add 3.7-dev
also remove quotes around version number, not needed for 3.7.
2018-08-09 09:17:57 +02:00
TW
464b604b52
Merge pull request #4016 from ThomasWaldmann/init-warning
init: add warning to store both key and passphrase at safe place(s)
2018-08-09 09:01:55 +02:00
Thomas Waldmann
eebc33a281 dump-repo-objs: filename layout improvements
(cherry picked from commit 24812b0317)
2018-08-09 08:29:46 +02:00
Thomas Waldmann
d6cb39a6d6 implement borg debug dump-repo-objs --ghost
intended as a last resort measure to export all segment file contents
in a relatively easy to use format.

if you want to dig into a damaged repo (e.g. missing segment files,
missing commits) and you know what you do.

note: dump-repo-objs --ghost must not use repo.list()

because this would need the repo index and call get_transaction_id and
check_transaction methods, which can easily fail on a damaged repo.

thus we use the same low level scan method as we use anyway to get
some encrypted piece of data to setup the decryption "key".

(cherry picked from commit 8738e85967)
2018-08-09 08:29:34 +02:00
Thomas Waldmann
a3a15ddf57 use repository.scan() for dump-repo-objs to get on-disk order
it is also more efficient, avoids random access.

(cherry picked from commit 2b7d65b024)
2018-08-09 08:29:24 +02:00
Thomas Waldmann
9445b00408 implement borg debug search-repo-objs searchterm
(cherry picked from commit c2ed0d9ee0)
2018-08-09 08:29:11 +02:00
Thomas Waldmann
4b31ad123f init: add warning to store both key and passphrase at safe place(s) 2018-08-09 07:25:49 +02:00
TW
a350dd8f3e
Merge pull request #3943 from ThomasWaldmann/wrap-msgpack
wrap msgpack to avoid api troubles
2018-08-06 18:11:49 +02:00
TW
d66c0d9eb0
Merge pull request #4011 from ThomasWaldmann/remove-zeromq
remove zeromq or python 3.5 references
2018-08-06 17:56:09 +02:00
TW
7c8ff1f699
Merge pull request #4012 from ThomasWaldmann/py37-setup-metadata
add python 3.7 to pypi metadata
2018-08-06 17:55:18 +02:00
Thomas Waldmann
8a09f26712 remove zeromq or python 3.5 references 2018-08-06 17:52:08 +02:00
Thomas Waldmann
751cd2caed add python 3.7 to pypi metadata 2018-08-06 17:48:27 +02:00
Thomas Waldmann
3c173cc03b wrap msgpack, fixes #3632, fixes #2738
wrap msgpack to avoid future upstream api changes making troubles
or that we would have to globally spoil our code with extra params.

make sure the packing is always with use_bin_type=False,
thus generating "old" msgpack format (as borg always did) from
bytes objects.

make sure the unpacking is always with raw=True,
thus generating bytes objects.

note:

safe unicode encoding/decoding for some kinds of data types is done in Item
class (see item.pyx), so it is enough if we care for bytes objects on the
msgpack level.

also wrap exception handling, so borg code can catch msgpack specific
exceptions even if the upstream msgpack code raises way too generic
exceptions typed Exception, TypeError or ValueError.
We use own Exception classes for this, upstream classes are deprecated
2018-08-06 17:32:55 +02:00
TW
4c8db8feb5
Merge pull request #4008 from ThomasWaldmann/fix-cachedir
don't archive tagged dir when recursing an excluded dir, fixes #3991
2018-08-06 17:29:52 +02:00
TW
1f911a7d2d
Merge pull request #4010 from ThomasWaldmann/difftest-minor
minor change: simplify test setup
2018-08-06 17:16:23 +02:00
Thomas Waldmann
9654126247 minor change: simplify test setup
most of the files created via self.create_test_files() are not needed.
the only one is the empty file, so just create it here.

also: move repo init to after test file creation.
2018-08-06 14:28:46 +02:00
Thomas Waldmann
8256c26cf2 don't archive tagged dir when recursing an excluded dir, fixes #3991
if we are recursing an explicitly excluded directory, we are only
looking for explicitly included items, but we do not need to archive
tagged directories or the tag files themselves - they are all excluded
by the explicit exclusion already.

for performance reasons, we still determine whether a directory is
tagged and if it is, we do not recurse into it as there can't be any
included items in there.
2018-08-05 19:51:49 +02:00
TW
68c2635d3a
Merge pull request #4007 from ThomasWaldmann/hostname-fqdn-cleanups
call socket.gethostname only once
2018-08-04 17:00:10 +01:00
Thomas Waldmann
d2e2f1b89d call socket.gethostname only once 2018-08-04 17:40:40 +02:00
TW
b73d805cd4
Merge pull request #4006 from ThomasWaldmann/machine-id
add BORG_HOST_ID, fixes #3985
2018-08-04 16:39:37 +01:00
Thomas Waldmann
90348c1de9 add BORG_HOST_ID, fixes #3985 2018-08-04 15:01:48 +02:00
TW
f7069f6c3b
Merge pull request #4005 from ThomasWaldmann/vagrant-py37
vagrant: add py37 for testing
2018-08-04 13:12:57 +01:00
Thomas Waldmann
578ac64385 vagrant: add py37 for testing 2018-07-31 23:16:08 +01:00
TW
87d48d7748
Merge pull request #4001 from ThomasWaldmann/py37
argparse fix for py37, enable py37 testing
2018-07-31 00:40:41 +01:00
Thomas Waldmann
fef9581690 tox / travis: enable testing on py37 2018-07-30 01:11:11 +01:00
Thomas Waldmann
52f1cd4bc6 argparse: work around bad default in py 3.7.0a/b/rc, fixes #3996 2018-07-30 01:04:14 +01:00
TW
eb6481e8d3
Merge pull request #3998 from ThomasWaldmann/py37
remove loggerDict.clear() from tearDown method, fixes #3805
2018-07-29 14:11:05 +01:00
Thomas Waldmann
a7dd2560ba remove loggerDict.clear() from tearDown method, fixes #3805
It causes problems with the new caching in the py37 logger module.

Removing loggerDict.clear() fixes this and makes the tests work again.
Also, it does not seem to have any negative effect, neither on py36
nor on py37.

See also: https://bugs.python.org/issue34269
2018-07-29 12:29:26 +01:00
James Rowell
34227430d4 Installation from source - setting python interpreter version (#3995)
explicit instructions for setting python interpreter when installing from source via git
2018-07-29 09:50:09 +01:00
Marvin Gaube
2a4ed3f0e8 Note regarding borg version (#3987)
add a note regarding in-file checkpointing and borg versions
2018-07-20 16:25:16 +02:00
TW
b5e11389fc
Merge pull request #3984 from ThomasWaldmann/locking-fixes-master
Locking: better logging, some asserts (fwd port to master)
2018-07-19 22:04:13 +02:00
Thomas Waldmann
3417de85e0 locking: more logging
(cherry picked from commit f86bf8a0a8)
2018-07-17 19:06:45 +02:00
Thomas Waldmann
a51fca49bf process_alive: add some assertions
(cherry picked from commit 2bf1b29e8e)
2018-07-17 19:06:26 +02:00
TW
a7e408db61
Merge pull request #3980 from ThomasWaldmann/update-coafile
coala: exclude some more stuff, move ignores to "all" section
2018-07-17 01:16:22 +02:00
TW
ffd78493aa
Merge pull request #3983 from ThomasWaldmann/fix-cache-lock-timeout-master
cache lock: use lock_wait everywhere to fix infinite wait (fwd port to master)
2018-07-17 01:15:45 +02:00
Thomas Waldmann
89c11f45ce cache lock: use lock_wait everywhere to fix infinite wait
also: clarify docs
(cherry picked from commit 2f3e60d9d5)
2018-07-16 23:50:04 +02:00
TW
9115ad58d9
Merge pull request #3970 from ThomasWaldmann/compact-commits2
compact commits / separate compaction
2018-07-14 23:47:47 +02:00
Thomas Waldmann
318cfffde1 update CHANGES about compaction changes 2018-07-14 19:15:09 +02:00
Thomas Waldmann
36cbc2d18f coala: ignore some stuff it warns about 2018-07-14 18:40:50 +02:00
Thomas Waldmann
d5152d8f2b coala: exclude some more stuff, move ignores to "all" section 2018-07-14 18:28:18 +02:00
Thomas Waldmann
a8d52351bb update man pages / usage docs 2018-07-14 14:56:29 +02:00
Thomas Waldmann
e6fcf4ea42 update docs about separated compaction 2018-07-14 14:53:23 +02:00
Thomas Waldmann
a221ca16ad remote: introduce a dontcare flag (all values acceptable)
in some cases the value of a new parameter does not really matter,
as long as it works / there is no malfunction.

without this change, a new borg client could not commit to an old
borg server (and would fail late when trying to commit):

- when using compact=False as it does at most places

- when using cleanup_commits=True as a user might trigger by running
  borg compact --cleanup-commits

we never want a borg commit "fail late", leaving the repo in a state
with uncommitted data, thus the server shall just commit, no matter
how it handles compaction or whether it can do the cleanup.
2018-07-14 14:29:28 +02:00
Thomas Waldmann
3715d2da3e slightly refactor write_commit using new "want_new" flag 2018-07-14 14:29:28 +02:00
Thomas Waldmann
1f387d911a start new segment file for put/del to MANIFEST_ID
specialcase deleting / writing the manifest to be in a separate, new
segment file, so that when we supersede and compact it later, less
segment data has to be shuffled around - compaction can then just
delete this segment file and that's all.
2018-07-14 14:29:28 +02:00
Thomas Waldmann
755eaeec0a borg compact --cleanup-commits to get rid of leftover 17byte segments
see #2850.
2018-07-14 14:29:28 +02:00
Thomas Waldmann
efe60bd640 test fixes 2018-07-14 14:29:28 +02:00
Marian Beermann
aeef082483 repository: track commits in hints 2018-07-14 14:29:28 +02:00