adminer/zrepl_patched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#342] endpoint: always create unencrypted placeholder filesystems

Browse Source 
This "breaks" the use case of receiving an unencrypted send into an encrypted receiver by setting the receiver's `root_fs`'s `encryption=on`.
"breaks" in air-quotes because we have not yet released a version of
zrepl with encrypted send support.

We will bring back the featured outlined above in a future release.
See https://github.com/zrepl/zrepl/issues/342#issuecomment-657231818 and following.
This commit is contained in:
Christian Schwarz
2020-07-12 16:32:28 +02:00
parent 4b8f0ad112
commit 8ff83f2f1a
4 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zfs/datasetpath_visitor_test.go
+27 -7
View File
@@ -28,8 +28,8 @@ func makeVisitRecorder() (v DatasetPathsVisitor, rec *visitRecorder) {
rec = &visitRecorder{
visits: make([]DatasetPathVisit, 0),
}
v = func(v DatasetPathVisit) bool {
rec.visits = append(rec.visits, v)
v = func(v *DatasetPathVisit) bool {
rec.visits = append(rec.visits, *v)
return true
}
return
@@ -43,6 +43,27 @@ func buildForest(paths []*DatasetPath) (f *DatasetPathForest) {
return
}
type expectedDatasetPathVisit struct {
expectPath *DatasetPath
expectFillIn bool
}
func (e *expectedDatasetPathVisit) AssertEqual(t *testing.T, actual DatasetPathVisit) {
assert.Equal(t, e.expectPath, actual.Path)
assert.Equal(t, e.expectFillIn, actual.FilledIn)
if actual.Parent != nil {
assert.Equal(t, actual.Parent.Path.Length()+1, e.expectPath.Length())
assert.True(t, e.expectPath.HasPrefix(actual.Parent.Path))
}
}
func expectedDatasetPathVisits(t *testing.T, expected []expectedDatasetPathVisit, actual []DatasetPathVisit) {
assert.Equal(t, len(expected), len(actual))
for i := range expected {
expected[i].AssertEqual(t, actual[i])
}
}
func TestDatasetPathForestWalkTopDown(t *testing.T) {
paths := []*DatasetPath{
@@ -56,7 +77,7 @@ func TestDatasetPathForestWalkTopDown(t *testing.T) {
buildForest(paths).WalkTopDown(v)
expectedVisits := []DatasetPathVisit{
expectedVisits := []expectedDatasetPathVisit{
{toDatasetPath("pool1"), false},
{toDatasetPath("pool1/foo"), true},
{toDatasetPath("pool1/foo/bar"), false},
@@ -65,8 +86,7 @@ func TestDatasetPathForestWalkTopDown(t *testing.T) {
{toDatasetPath("pool2/test"), true},
{toDatasetPath("pool2/test/bar"), false},
}
assert.Equal(t, expectedVisits, rec.visits)
expectedDatasetPathVisits(t, expectedVisits, rec.visits)
}
func TestDatasetPathWalkTopDownWorksUnordered(t *testing.T) {
@@ -82,7 +102,7 @@ func TestDatasetPathWalkTopDownWorksUnordered(t *testing.T) {
buildForest(paths).WalkTopDown(v)
expectedVisits := []DatasetPathVisit{
expectedVisits := []expectedDatasetPathVisit{
{toDatasetPath("pool1"), false},
{toDatasetPath("pool1/foo"), true},
{toDatasetPath("pool1/foo/bar"), false},
@@ -91,6 +111,6 @@ func TestDatasetPathWalkTopDownWorksUnordered(t *testing.T) {
{toDatasetPath("pool1/bang/baz"), false},
}
assert.Equal(t, expectedVisits, rec.visits)
expectedDatasetPathVisits(t, expectedVisits, rec.visits)
}