Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions storage/volume/core_util.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package volume

import (
"fmt"
"path"

"github.com/alibaba/pouch/storage/volume/driver"
Expand All @@ -21,40 +20,3 @@ func (c *Core) volumePath(v *types.Volume, dv driver.Driver) (string, error) {

return p, nil
}

func checkVolume(v *types.Volume) error {
if v.Spec.ClusterID == "" || v.Status.Phase == types.VolumePhaseFailed {
err := fmt.Errorf("volume is created failed: %s", v.Name)
return err
} else if v.Status.Phase != types.VolumePhaseReady {
err := fmt.Errorf("volume is being creating: %s", v.Name)
return err
}

return nil
}

func checkOptions(v *types.Volume) error {
var (
driverOpts map[string]types.Option
)

dv, err := driver.Get(v.Spec.Backend)
if err != nil {
return errors.Errorf("failed to get backend driver %s: %v", v.Spec.Backend, err)
}

if opt, ok := dv.(driver.Opt); ok {
driverOpts = opt.Options()
}

if driverOpts != nil {
for name, opt := range driverOpts {
if _, ok := v.Spec.Extra[name]; !ok {
v.Spec.Extra[name] = opt.Value
}
}
}

return nil
}
4 changes: 0 additions & 4 deletions storage/volume/driver/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ type remoteVolumeRemoveReq struct {
Name string `json:"Name"`
}

type remoteVolumeRemoveResp struct {
Err string `json:"Err"`
}

type remoteVolumeMountReq struct {
Name string `json:"Name"`
ID string `json:"ID"`
Expand Down
4 changes: 0 additions & 4 deletions storage/volume/types/vars.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
package types

const (
defaultSize = "100G"
defaultFileSystem = "ext4"
defaultMountpoint = "/mnt"
optionPath = "mount"
optionSize = "opt.size"
optionSifter = "sifter"
optionFS = "opt.fs"
optionWBps = "opt.wbps"
optionRBps = "opt.rbps"
Expand Down