extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-05-10 03:05:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

zfs: use custom datatype to pass ZFS properties in ZFSSet

Browse Source 
refs #55
This commit is contained in:
Christian Schwarz 2018-01-05 18:42:10 +01:00
parent 787675aee8
commit 5f2c14adab
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/replication.go
View File

@ -173,7 +173,9 @@ func (p *Puller) replFilesystem(m remoteLocalMapping, localFilesystemState map[s
// TODO unify with recv path of ConflictIncremental // TODO unify with recv path of ConflictIncremental
log.Debug("configuring properties of received filesystem") log.Debug("configuring properties of received filesystem")
if err = zfs.ZFSSet(m.Local, "readonly", "on"); err != nil { props := zfs.NewZFSProperties()
props.Set("readonly", "on")
if err = zfs.ZFSSet(m.Local, props); err != nil {
log.WithError(err).Error("cannot set readonly property") log.WithError(err).Error("cannot set readonly property")
} }

34
zfs/zfs.go
View File

@ -239,13 +239,39 @@ func ZFSRecv(fs *DatasetPath, stream io.Reader, additionalArgs ...string) (err e
return nil return nil
} }
func ZFSSet(fs *DatasetPath, prop, val string) (err error) { type ZFSProperties struct {
m map[string]string
}
if strings.ContainsRune(prop, '=') { func NewZFSProperties() *ZFSProperties {
panic("prop contains rune '=' which is the delimiter between property name and value") return &ZFSProperties{make(map[string]string, 4)}
}
func (p *ZFSProperties) Set(key, val string) {
p.m[key] = val
}
func (p *ZFSProperties) appendArgs(args *[]string) (err error) {
for prop, val := range p.m {
if strings.Contains(prop, "=") {
return errors.New("prop contains rune '=' which is the delimiter between property name and value")
} }
*args = append(*args, fmt.Sprintf("%s=%s", prop, val))
}
return nil
}
cmd := exec.Command(ZFS_BINARY, "set", fmt.Sprintf("%s=%s", prop, val), fs.ToString()) func ZFSSet(fs *DatasetPath, props *ZFSProperties) (err error) {
args := make([]string, 0)
args = append(args, "set")
err = props.appendArgs(&args)
if err != nil {
return err
}
args = append(args, fs.ToString())
cmd := exec.Command(ZFS_BINARY, args...)
stderr := bytes.NewBuffer(make([]byte, 0, 1024)) stderr := bytes.NewBuffer(make([]byte, 0, 1024))
cmd.Stderr = stderr cmd.Stderr = stderr