Skip to content

Fix resize-related sanity test failures #1083

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

Merged
merged 1 commit into from
Nov 23, 2022
Merged

Fix resize-related sanity test failures #1083

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/gce-pd-csi-driver/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"k8s.io/klog/v2"

"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/deviceutils"
gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
metadataservice "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/metadata"
driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-pd-csi-driver"
Expand Down Expand Up @@ -134,7 +135,7 @@ func handle() {
if err != nil {
klog.Fatalf("Failed to get safe mounter: %w", err)
}
deviceUtils := mountmanager.NewDeviceUtils()
deviceUtils := deviceutils.NewDeviceUtils()
statter := mountmanager.NewStatter(mounter)
meta, err := metadataservice.NewMetadataService()
if err != nil {
Expand Down
Empty file added creds/cloud-sa.json
View file
Open in desktop
Empty file.
10 changes: 9 additions & 1 deletion pkg/mount-manager/device-utils.go → pkg/deviceutils/device-utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package mountmanager
package deviceutils

import (
"fmt"
Expand All @@ -27,6 +27,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2"
pathutils "k8s.io/utils/path"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/resizefs"
)

const (
Expand Down Expand Up @@ -84,6 +85,9 @@ type DeviceUtils interface {
// DisableDevice performs necessary disabling prior to a device being
// detached from a node. The path is that from GetDiskByIdPaths.
DisableDevice(devicePath string) error

// Resize returns whether or not a device needs resizing.
Resize(resizer resizefs.Resizefs, devicePath string, deviceMountPath string) (bool, error)
}

type deviceUtils struct {
Expand Down Expand Up @@ -274,6 +278,10 @@ func (m *deviceUtils) VerifyDevicePath(devicePaths []string, deviceName string)
return devicePath, nil
}

func (m *deviceUtils) Resize(resizer resizefs.Resizefs, devicePath string, deviceMountPath string) (bool, error) {
return resizer.Resize(devicePath, deviceMountPath)
}

// getDevFsSerial returns the serial number of the /dev/* path at devFsPath.
// If devFsPath does not start with a known prefix, returns the empty string.
func getDevFsSerial(devFsPath string) (string, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/mount-manager/device-utils_linux.go → pkg/deviceutils/device-utils_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package mountmanager
package deviceutils

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion pkg/mount-manager/device-utils_test.go → pkg/deviceutils/device-utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mountmanager
package deviceutils

import (
"testing"
Expand Down
2 changes: 1 addition & 1 deletion pkg/mount-manager/device-utils_windows.go → pkg/deviceutils/device-utils_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package mountmanager
package deviceutils

func (_ *deviceUtils) DisableDevice(devicePath string) error {
// No disabling is necessary on windows.
Expand Down
8 changes: 7 additions & 1 deletion pkg/mount-manager/fake-device-utils.go → pkg/deviceutils/fake-device-utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package mountmanager
package deviceutils

import "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/resizefs"

type fakeDeviceUtils struct {
}
Expand All @@ -38,3 +40,7 @@ func (_ *fakeDeviceUtils) DisableDevice(devicePath string) error {
// No-op for testing.
return nil
}

func (_ *fakeDeviceUtils) Resize(resizer resizefs.Resizefs, devicePath string, deviceMountPath string) (bool, error) {
return false, nil
}
3 changes: 2 additions & 1 deletion pkg/gce-pd-csi-driver/gce-pd-driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"k8s.io/klog/v2"
"k8s.io/mount-utils"
common "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/deviceutils"
gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
metadataservice "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/metadata"
mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
Expand Down Expand Up @@ -137,7 +138,7 @@ func NewIdentityServer(gceDriver *GCEDriver) *GCEIdentityServer {
}
}

func NewNodeServer(gceDriver *GCEDriver, mounter *mount.SafeFormatAndMount, deviceUtils mountmanager.DeviceUtils, meta metadataservice.MetadataService, statter mountmanager.Statter) *GCENodeServer {
func NewNodeServer(gceDriver *GCEDriver, mounter *mount.SafeFormatAndMount, deviceUtils deviceutils.DeviceUtils, meta metadataservice.MetadataService, statter mountmanager.Statter) *GCENodeServer {
return &GCENodeServer{
Driver: gceDriver,
Mounter: mounter,
Expand Down
10 changes: 5 additions & 5 deletions pkg/gce-pd-csi-driver/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"k8s.io/mount-utils"

"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/deviceutils"
metadataservice "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/metadata"
mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/resizefs"
Expand All @@ -38,7 +39,7 @@ import (
type GCENodeServer struct {
Driver *GCEDriver
Mounter *mount.SafeFormatAndMount
DeviceUtils mountmanager.DeviceUtils
DeviceUtils deviceutils.DeviceUtils
VolumeStatter mountmanager.Statter
MetadataService metadataservice.MetadataService

Expand Down Expand Up @@ -343,10 +344,9 @@ func (ns *GCENodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStage
// Part 4: Resize filesystem.
// https://github.com/kubernetes/kubernetes/issues/94929
resizer := resizefs.NewResizeFs(ns.Mounter)
_, err = resizer.Resize(devicePath, stagingTargetPath)
_, err = ns.DeviceUtils.Resize(resizer, devicePath, stagingTargetPath)
if err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("error when resizing volume %s: %v", volumeID, err))

return nil, status.Error(codes.Internal, fmt.Sprintf("error when resizing volume %s from device '%s' at path '%s': %v", volumeID, devicePath, stagingTargetPath, err))
}

klog.V(4).Infof("NodeStageVolume succeeded on %v to %s", volumeID, stagingTargetPath)
Expand Down Expand Up @@ -508,7 +508,7 @@ func (ns *GCENodeServer) NodeExpandVolume(ctx context.Context, req *csi.NodeExpa
resizer := resizefs.NewResizeFs(ns.Mounter)
_, err = resizer.Resize(devicePath, volumePath)
if err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("error when resizing volume %s: %v", volKey.String(), err))
return nil, status.Error(codes.Internal, fmt.Sprintf("error when resizing volume %s from device '%s' at path '%s': %v", volKey.String(), devicePath, volumePath, err))

}

Expand Down
14 changes: 8 additions & 6 deletions pkg/gce-pd-csi-driver/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,18 @@ import (
"context"
"fmt"
"io/ioutil"
"k8s.io/utils/exec"
testingexec "k8s.io/utils/exec/testing"
"os"
"path/filepath"
"testing"

"k8s.io/utils/exec"
testingexec "k8s.io/utils/exec/testing"

csi "github.com/container-storage-interface/spec/lib/go/csi"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"k8s.io/mount-utils"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/deviceutils"
metadataservice "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/metadata"
mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
)
Expand All @@ -38,14 +40,14 @@ const defaultTargetPath = "/mnt/test"
const defaultStagingPath = "/staging"

func getTestGCEDriver(t *testing.T) *GCEDriver {
return getCustomTestGCEDriver(t, mountmanager.NewFakeSafeMounter(), mountmanager.NewFakeDeviceUtils(), metadataservice.NewFakeService())
return getCustomTestGCEDriver(t, mountmanager.NewFakeSafeMounter(), deviceutils.NewFakeDeviceUtils(), metadataservice.NewFakeService())
}

func getTestGCEDriverWithCustomMounter(t *testing.T, mounter *mount.SafeFormatAndMount) *GCEDriver {
return getCustomTestGCEDriver(t, mounter, mountmanager.NewFakeDeviceUtils(), metadataservice.NewFakeService())
return getCustomTestGCEDriver(t, mounter, deviceutils.NewFakeDeviceUtils(), metadataservice.NewFakeService())
}

func getCustomTestGCEDriver(t *testing.T, mounter *mount.SafeFormatAndMount, deviceUtils mountmanager.DeviceUtils, metaService metadataservice.MetadataService) *GCEDriver {
func getCustomTestGCEDriver(t *testing.T, mounter *mount.SafeFormatAndMount, deviceUtils deviceutils.DeviceUtils, metaService metadataservice.MetadataService) *GCEDriver {
gceDriver := GetGCEDriver()
nodeServer := NewNodeServer(gceDriver, mounter, deviceUtils, metaService, mountmanager.NewFakeStatter(mounter))
err := gceDriver.SetupGCEDriver(driver, "test-vendor", nil, nil, nil, nodeServer)
Expand All @@ -58,7 +60,7 @@ func getCustomTestGCEDriver(t *testing.T, mounter *mount.SafeFormatAndMount, dev
func getTestBlockingGCEDriver(t *testing.T, readyToExecute chan chan struct{}) *GCEDriver {
gceDriver := GetGCEDriver()
mounter := mountmanager.NewFakeSafeBlockingMounter(readyToExecute)
nodeServer := NewNodeServer(gceDriver, mounter, mountmanager.NewFakeDeviceUtils(), metadataservice.NewFakeService(), mountmanager.NewFakeStatter(mounter))
nodeServer := NewNodeServer(gceDriver, mounter, deviceutils.NewFakeDeviceUtils(), metadataservice.NewFakeService(), mountmanager.NewFakeStatter(mounter))
err := gceDriver.SetupGCEDriver(driver, "test-vendor", nil, nil, nil, nodeServer)
if err != nil {
t.Fatalf("Failed to setup GCE Driver: %v", err)
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/tests/single_zone_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/deviceutils"
gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
testutils "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/e2e/utils"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/remote"

Expand Down Expand Up @@ -122,7 +122,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
}()

// MESS UP THE symlink
devicePaths := mountmanager.NewDeviceUtils().GetDiskByIdPaths(volName, "")
devicePaths := deviceutils.NewDeviceUtils().GetDiskByIdPaths(volName, "")
for _, devicePath := range devicePaths {
err = testutils.RmAll(instance, devicePath)
Expect(err).To(BeNil(), "failed to remove /dev/by-id folder")
Expand Down Expand Up @@ -194,7 +194,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
}()

// DELETE THE symlink
devicePaths := mountmanager.NewDeviceUtils().GetDiskByIdPaths(volName, "")
devicePaths := deviceutils.NewDeviceUtils().GetDiskByIdPaths(volName, "")
for _, devicePath := range devicePaths {
err = testutils.RmAll(instance, devicePath)
Expect(err).To(BeNil(), "failed to remove /dev/by-id folder")
Expand Down
3 changes: 2 additions & 1 deletion test/sanity/sanity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
sanity "github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
compute "google.golang.org/api/compute/v1"
common "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/deviceutils"
gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
metadataservice "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/metadata"
driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-pd-csi-driver"
Expand Down Expand Up @@ -60,7 +61,7 @@ func TestSanity(t *testing.T) {
}

mounter := mountmanager.NewFakeSafeMounter()
deviceUtils := mountmanager.NewFakeDeviceUtils()
deviceUtils := deviceutils.NewFakeDeviceUtils()

//Initialize GCE Driver
identityServer := driver.NewIdentityServer(gceDriver)
Expand Down