Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hide underlying implementation and fix bz1328588 #6

Merged
merged 1 commit into from
May 3, 2016
Merged

Hide underlying implementation and fix bz1328588 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ _testmain.go
*.exe
*.test
*.prof

docker-lvm-plugin
57 changes: 41 additions & 16 deletions driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,47 @@ func (l *lvmDriver) Create(req volume.Request) volume.Response {
}

cmdArgs := []string{"-n", req.Name}
if s, ok := req.Options["size"]; ok && s != "" {
cmdArgs = append(cmdArgs, "--size", s)
s, ok := req.Options["size"]
if !ok || (ok && s == "") {
return resp(fmt.Errorf("Please specify a size with --size"))
}
cmdArgs = append(cmdArgs, "--size", s)
cmdArgs = append(cmdArgs, vgName)

cmd := exec.Command("lvcreate", cmdArgs...)
if out, err := cmd.CombinedOutput(); err != nil {
return resp(fmt.Errorf("%s", string(out)))
if _, err := cmd.CombinedOutput(); err != nil {
return resp(fmt.Errorf("error creating volume"))
}

var err error

defer func() {
if err != nil {
removeLogicalVolume(req.Name, vgName)
}
}()

cmd = exec.Command("mkfs.xfs", fmt.Sprintf("/dev/%s/%s", vgName, req.Name))
if out, err := cmd.CombinedOutput(); err != nil {
return resp(fmt.Errorf("%s", string(out)))
_, err = cmd.CombinedOutput()
if err != nil {
return resp(fmt.Errorf("error partitioning volume"))
}

mp := getMountpoint(l.home, req.Name)
if err := os.MkdirAll(mp, 0700); err != nil {
err = os.MkdirAll(mp, 0700)
if err != nil {
return resp(err)
}
defer func() {
if err != nil {
os.RemoveAll(mp)
}
}()

v := &vol{req.Name, mp}
l.volumes[v.Name] = v
l.count[v.Name] = 0
if err := saveToDisk(l.volumes, l.count); err != nil {
err = saveToDisk(l.volumes, l.count)
if err != nil {
return resp(err)
}
return resp(v.MountPoint)
Expand Down Expand Up @@ -120,9 +137,8 @@ func (l *lvmDriver) Remove(req volume.Request) volume.Response {
return resp(err)
}

cmd := exec.Command("lvremove", "--force", fmt.Sprintf("%s/%s", vgName, req.Name))
if out, err := cmd.CombinedOutput(); err != nil {
return resp(fmt.Errorf("%s", string(out)))
if _, err := removeLogicalVolume(req.Name, vgName); err != nil {
return resp(fmt.Errorf("error removing volume"))
}

delete(l.count, req.Name)
Expand All @@ -133,22 +149,31 @@ func (l *lvmDriver) Remove(req volume.Request) volume.Response {
return resp(getMountpoint(l.home, req.Name))
}

func removeLogicalVolume(name, vgName string) ([]byte, error) {
cmd := exec.Command("lvremove", "--force", fmt.Sprintf("%s/%s", vgName, name))
if out, err := cmd.CombinedOutput(); err != nil {
return out, err
}
return nil, nil
}

func (l *lvmDriver) Path(req volume.Request) volume.Response {
return resp(getMountpoint(l.home, req.Name))
}

func (l *lvmDriver) Mount(req volume.Request) volume.Response {
l.mu.Lock()
defer l.mu.Unlock()

l.count[req.Name]++
vgName, err := getVolumegroupName(l.vgConfig)
if err != nil {
return resp(err)
}
if l.count[req.Name] == 1 {
cmd := exec.Command("mount", fmt.Sprintf("/dev/%s/%s", vgName, req.Name), getMountpoint(l.home, req.Name))
if out, err := cmd.CombinedOutput(); err != nil {
return resp(fmt.Errorf("%s", string(out)))
if _, err := cmd.CombinedOutput(); err != nil {
return resp(fmt.Errorf("error mouting volume"))
}
}
if err := saveToDisk(l.volumes, l.count); err != nil {
Expand All @@ -163,8 +188,8 @@ func (l *lvmDriver) Unmount(req volume.Request) volume.Response {
l.count[req.Name]--
if l.count[req.Name] == 0 {
cmd := exec.Command("umount", getMountpoint(l.home, req.Name))
if out, err := cmd.CombinedOutput(); err != nil {
return resp(fmt.Errorf("%s", string(out)))
if _, err := cmd.CombinedOutput(); err != nil {
return resp(fmt.Errorf("error unmounting volume"))
}
}
if err := saveToDisk(l.volumes, l.count); err != nil {
Expand Down