technofab/zfs-localpv
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/zfs-localpv.git synced 2025-12-12 06:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix (localpv): fixing CSIStorageCapacity when "poolname" param has child dataset (#393)

Browse source 
Signed-off-by: Fábián Tamás László <giganetom@gmail.com>
This commit is contained in:
Fábián Tamás László 2021-10-05 16:54:11 +02:00 • committed by GitHub
parent 0ef2444eea
commit 37a5cb80e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
changelogs/unreleased/392-zero-cap-nonroot-ds Normal file
View file

@ -0,0 +1,3 @@
Fixes GetCapacity in pkg/driver/controller.go to report the ZFS pool
capacity even when using a child dataset at the storage class' poolname
attribute.

27
pkg/driver/controller.go
View file

@ -873,9 +873,34 @@ func (cs *controller) GetCapacity(
} }
zfsNodesCache := cs.zfsNodeInformer.GetIndexer() zfsNodesCache := cs.zfsNodeInformer.GetIndexer()
params := req.GetParameters() params := req.GetParameters()
poolParam := helpers.GetInsensitiveParameter(&params, "poolname") poolParam := helpers.GetInsensitiveParameter(&params, "poolname")
// The "poolname" parameter can either be the name of a ZFS pool
// (e.g. "zpool"), or a path to a child dataset (e.g. "zpool/k8s/localpv").
//
// We parse the "poolname" parameter so the name of the ZFS pool and the
// path to the dataset is available separately.
//
// The dataset path is not used now. It could be used later to query the
// capacity of the child dataset, which could be smaller than the capacity
// of the whole pool.
//
// This is necessary because capacity calculation currently only works with
// ZFS pool names. This is why it always returns the capacitry of the whole
// pool, even if the child dataset given as the "poolname" parameter has a
// smaller capacity than the whole pool.
poolname, _ := func() (string, string) {
poolParamSliced := strings.SplitN(poolParam, "/", 2)
if len(poolParamSliced) == 2 {
return poolParamSliced[0], poolParamSliced[1]
} else {
return poolParamSliced[0], ""
}
}()
var availableCapacity int64 var availableCapacity int64
for _, nodeName := range nodeNames { for _, nodeName := range nodeNames {
v, exists, err := zfsNodesCache.GetByKey(zfs.OpenEBSNamespace + "/" + nodeName) v, exists, err := zfsNodesCache.GetByKey(zfs.OpenEBSNamespace + "/" + nodeName)
@ -892,7 +917,7 @@ func (cs *controller) GetCapacity(
// See https://github.com/kubernetes/enhancements/tree/master/keps/sig-storage/1472-storage-capacity-tracking#available-capacity-vs-maximum-volume-size & // See https://github.com/kubernetes/enhancements/tree/master/keps/sig-storage/1472-storage-capacity-tracking#available-capacity-vs-maximum-volume-size &
// https://github.com/container-storage-interface/spec/issues/432 for more details // https://github.com/container-storage-interface/spec/issues/432 for more details
for _, zpool := range zfsNode.Pools { for _, zpool := range zfsNode.Pools {
if zpool.Name != poolParam { if zpool.Name != poolname {
continue continue
} }
freeCapacity := zpool.Free.Value() freeCapacity := zpool.Free.Value()