6 Commits

Author	SHA1	Message	Date
Christian Schwarz	edcd258cc9	replication: more elaborate messages for Conflict errors	2019-03-13 18:46:04 +01:00
Christian Schwarz	d50e553ebb	handle changes to placeholder state correctly ... We assumed that `zfs recv -F FS` would basically replace FS inplace, leaving its children untouched. That is in fact not the case, it only works if `zfs send -R` is set, which we don't do. Thus, implement the required functionality manually. This solves a `zfs recv` error that would occur when a filesystem previously created as placeholder on the receiving side becomes a non-placeholder filesystem (likely due to config change on the sending side): zfs send pool1/foo@1 | zfs recv -F pool1/bar cannot receive new filesystem stream: destination has snapshots (eg. pool1/bar) must destroy them to overwrite it	2019-03-13 18:46:04 +01:00
Christian Schwarz	1eb0f12a61	replication: add diff test case	2019-03-13 18:45:40 +01:00
Christian Schwarz	8129ed91f1	zfs + replication: migrate dead zfs/diff_test.go to replication/logic/diff ... (and remove the dead code from package zfs)	2019-03-13 16:39:10 +01:00
Christian Schwarz	c87759affe	replication/driver: automatic retries on connectivity-related errors	2019-03-13 15:00:40 +01:00
Christian Schwarz	07b43bffa4	replication: refactor driving logic (no more explicit state machine)	2019-03-13 15:00:40 +01:00