Skip to content

Add VolumeStats for Windows #627

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.

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

Merged
merged 1 commit into from
Oct 10, 2020
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
5 changes: 4 additions & 1 deletion cmd/gce-pd-csi-driver/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ func handle() {
klog.Fatalf("Failed to get safe mounter: %v", err)
}
deviceUtils := mountmanager.NewDeviceUtils()
statter := mountmanager.NewStatter()
statter, err := mountmanager.NewStatter()
if err != nil {
klog.Fatalf("Failed to set up Statter: %v", err)
}
meta, err := metadataservice.NewMetadataService()
if err != nil {
klog.Fatalf("Failed to set up metadata service: %v", err)
Expand Down
3 changes: 1 addition & 2 deletions pkg/gce-pd-csi-driver/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ func (ns *GCENodeServer) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGe
return nil, status.Error(codes.InvalidArgument, "NodeGetVolumeStats volume path was empty")
}

_, err := os.Stat(req.VolumePath)
_, err := os.Lstat(req.VolumePath)
if err != nil {
if os.IsNotExist(err) {
return nil, status.Errorf(codes.NotFound, "path %s does not exist", req.VolumePath)
Expand All @@ -411,7 +411,6 @@ func (ns *GCENodeServer) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGe
},
}, nil
}

available, capacity, used, inodesFree, inodes, inodesUsed, err := ns.VolumeStatter.StatFS(req.VolumePath)
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to get fs info on path %s: %v", req.VolumePath, err)
Expand Down
1 change: 1 addition & 0 deletions pkg/gce-pd-csi-driver/utils_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package gceGCEDriver

import (
"fmt"

"k8s.io/utils/mount"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
mounter "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
Expand Down
4 changes: 2 additions & 2 deletions pkg/mount-manager/statter_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ var _ Statter = realStatter{}
type realStatter struct {
}

func NewStatter() realStatter {
return realStatter{}
func NewStatter() (realStatter, error) {
return realStatter{}, nil
}

// IsBlock checks if the given path is a block device
Expand Down
42 changes: 36 additions & 6 deletions pkg/mount-manager/statter_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,57 @@ limitations under the License.
package mountmanager

import (
"fmt"
"context"

volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta1"
)

var _ Statter = realStatter{}

type realStatter struct {
VolumeClient *volumeclient.Client
}

func NewStatter() realStatter {
return realStatter{}
func NewStatter() (realStatter, error) {
volumeClient, err := volumeclient.NewClient()
if err != nil {
return realStatter{}, err
}
return realStatter{
VolumeClient: volumeClient,
}, nil
}

// IsBlock checks if the given path is a block device
func (realStatter) IsBlockDevice(fullPath string) (bool, error) {
return false, nil
}

//TODO (jinxu): implement StatFS to get metrics
func (realStatter) StatFS(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
// StatFS returns volume usage information
func (r realStatter) StatFS(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
zero := int64(0)
return zero, zero, zero, zero, zero, zero, fmt.Errorf("Not implemented")

idRequest := &volumeapi.VolumeIDFromMountRequest{
Mount: path,
}
idResponse, err := r.VolumeClient.GetVolumeIDFromMount(context.Background(), idRequest)
if err != nil {
return zero, zero, zero, zero, zero, zero, err
}
volumeId := idResponse.GetVolumeId()

request := &volumeapi.VolumeStatsRequest{
VolumeId: volumeId,
}
response, err := r.VolumeClient.VolumeStats(context.Background(), request)
if err != nil {
return zero, zero, zero, zero, zero, zero, err
}
capacity = response.GetVolumeSize()
used = response.GetVolumeUsedSize()
available = capacity - used
return available, capacity, used, zero, zero, zero, nil
}

type fakeStatter struct{}
Expand Down