extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-12-22 15:11:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

zfs: add 'received' property source, handle 'any' source correctly and use 'any' for placeholder FS detection

Browse Source 
we want was first noticed in zfs 0.8rc1

Upstream doc PR: https://github.com/zfsonlinux/zfs/pull/8134
This commit is contained in:
Christian Schwarz 2018-11-16 11:12:29 +01:00
parent 3472145df6
commit 7ab51fad0d
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zfs/diff.go
View File

@ -248,7 +248,7 @@ func IsPlaceholder(p *DatasetPath, placeholderPropertyValue string) (isPlacehold
// for nonexistent FS, isPlaceholder == false && err == nil // for nonexistent FS, isPlaceholder == false && err == nil
func ZFSIsPlaceholderFilesystem(p *DatasetPath) (isPlaceholder bool, err error) { func ZFSIsPlaceholderFilesystem(p *DatasetPath) (isPlaceholder bool, err error) {
props, err := zfsGet(p.ToString(), []string{ZREPL_PLACEHOLDER_PROPERTY_NAME}, sourceLocal) props, err := zfsGet(p.ToString(), []string{ZREPL_PLACEHOLDER_PROPERTY_NAME}, sourceAny)
if err == io.ErrUnexpectedEOF { if err == io.ErrUnexpectedEOF {
// interpret this as an early exit of the zfs binary due to the fs not existing // interpret this as an early exit of the zfs binary due to the fs not existing
return false, nil return false, nil

5
zfs/zfs.go
View File

@ -601,17 +601,20 @@ const (
sourceInherited sourceInherited
sourceNone sourceNone
sourceTemporary sourceTemporary
sourceReceived
sourceAny zfsPropertySource = ^zfsPropertySource(0) sourceAny zfsPropertySource = ^zfsPropertySource(0)
) )
func (s zfsPropertySource) zfsGetSourceFieldPrefixes() []string { func (s zfsPropertySource) zfsGetSourceFieldPrefixes() []string {
prefixes := make([]string, 0, 5) prefixes := make([]string, 0, 7)
if s&sourceLocal != 0 {prefixes = append(prefixes, "local")} if s&sourceLocal != 0 {prefixes = append(prefixes, "local")}
if s&sourceDefault != 0 {prefixes = append(prefixes, "default")} if s&sourceDefault != 0 {prefixes = append(prefixes, "default")}
if s&sourceInherited != 0 {prefixes = append(prefixes, "inherited")} if s&sourceInherited != 0 {prefixes = append(prefixes, "inherited")}
if s&sourceNone != 0 {prefixes = append(prefixes, "-")} if s&sourceNone != 0 {prefixes = append(prefixes, "-")}
if s&sourceTemporary != 0 { prefixes = append(prefixes, "temporary")} if s&sourceTemporary != 0 { prefixes = append(prefixes, "temporary")}
if s&sourceReceived != 0 { prefixes = append(prefixes, "received")}
if s == sourceAny { prefixes = append(prefixes, "") }
return prefixes return prefixes
} }

3
zfs/zfs_test.go
View File

@ -39,7 +39,8 @@ func TestZFSPropertySource(t *testing.T) {
}{ }{
{ {
in: sourceAny, in: sourceAny,
exp: []string{"local", "default", "inherited", "-", "temporary"}, // although empty prefix matches any source
exp: []string{"local", "default", "inherited", "-", "temporary", "received", ""},
}, },
{ {
in: sourceTemporary, in: sourceTemporary,