github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Run volume cloning tests in the same topology segment

Browse Source 
Some CSI drivers can't clone a volume into other topology segment (e.g. a
cloud availability zone). The scheduler does not know about these
restrictions and schedules pods with PVCs that clone a volume mostly
randomly.

Run all volume cloning tests in the same topology segment, if such segment
is available and has at least one schedulable node.
This commit is contained in:
Jan Safranek 2021-06-16 11:09:34 +02:00
parent 3e0269ce6e
commit 057422504a
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/storage/testsuites/provisioning.go
View File

@ -60,6 +60,7 @@ type StorageClassTest struct {
PvCheck func(claim *v1.PersistentVolumeClaim) PvCheck func(claim *v1.PersistentVolumeClaim)
VolumeMode v1.PersistentVolumeMode VolumeMode v1.PersistentVolumeMode
AllowVolumeExpansion bool AllowVolumeExpansion bool
NodeSelection e2epod.NodeSelection
} }
type provisioningTestSuite struct { type provisioningTestSuite struct {
@ -242,12 +243,20 @@ func (p *provisioningTestSuite) DefineTests(driver storageframework.TestDriver,
init() init()
defer cleanup() defer cleanup()
if l.config.ClientNodeSelection.Name == "" {
// Schedule all pods to the same topology segment (e.g. a cloud availability zone), some
// drivers don't support cloning across them.
if err := ensureTopologyRequirements(&l.config.ClientNodeSelection, l.cs, dInfo, 1); err != nil {
framework.Failf("Error setting topology requirements: %v", err)
}
}
testConfig := storageframework.ConvertTestConfig(l.config) testConfig := storageframework.ConvertTestConfig(l.config)
expectedContent := fmt.Sprintf("Hello from namespace %s", f.Namespace.Name) expectedContent := fmt.Sprintf("Hello from namespace %s", f.Namespace.Name)
dataSource, dataSourceCleanup := preparePVCDataSourceForProvisioning(f, testConfig, l.cs, l.sourcePVC, l.sc, pattern.VolMode, expectedContent) dataSource, dataSourceCleanup := preparePVCDataSourceForProvisioning(f, testConfig, l.cs, l.sourcePVC, l.sc, pattern.VolMode, expectedContent)
defer dataSourceCleanup() defer dataSourceCleanup()
l.pvc.Spec.DataSource = dataSource l.pvc.Spec.DataSource = dataSource
l.testCase.NodeSelection = testConfig.ClientNodeSelection
l.testCase.PvCheck = func(claim *v1.PersistentVolumeClaim) { l.testCase.PvCheck = func(claim *v1.PersistentVolumeClaim) {
ginkgo.By("checking whether the created volume has the pre-populated data") ginkgo.By("checking whether the created volume has the pre-populated data")
tests := []e2evolume.Test{ tests := []e2evolume.Test{
@ -275,6 +284,13 @@ func (p *provisioningTestSuite) DefineTests(driver storageframework.TestDriver,
init() init()
defer cleanup() defer cleanup()
if l.config.ClientNodeSelection.Name == "" {
// Schedule all pods to the same topology segment (e.g. a cloud availability zone), some
// drivers don't support cloning across them.
if err := ensureTopologyRequirements(&l.config.ClientNodeSelection, l.cs, dInfo, 1); err != nil {
framework.Failf("Error setting topology requirements: %v", err)
}
}
testConfig := storageframework.ConvertTestConfig(l.config) testConfig := storageframework.ConvertTestConfig(l.config)
expectedContent := fmt.Sprintf("Hello from namespace %s", f.Namespace.Name) expectedContent := fmt.Sprintf("Hello from namespace %s", f.Namespace.Name)
dataSource, dataSourceCleanup := preparePVCDataSourceForProvisioning(f, testConfig, l.cs, l.sourcePVC, l.sc, pattern.VolMode, expectedContent) dataSource, dataSourceCleanup := preparePVCDataSourceForProvisioning(f, testConfig, l.cs, l.sourcePVC, l.sc, pattern.VolMode, expectedContent)
@ -293,6 +309,7 @@ func (p *provisioningTestSuite) DefineTests(driver storageframework.TestDriver,
myTestConfig.Prefix = fmt.Sprintf("%s-%d", myTestConfig.Prefix, i) myTestConfig.Prefix = fmt.Sprintf("%s-%d", myTestConfig.Prefix, i)
t := *l.testCase t := *l.testCase
t.NodeSelection = testConfig.ClientNodeSelection
t.PvCheck = func(claim *v1.PersistentVolumeClaim) { t.PvCheck = func(claim *v1.PersistentVolumeClaim) {
ginkgo.By(fmt.Sprintf("checking whether the created volume %d has the pre-populated data", i)) ginkgo.By(fmt.Sprintf("checking whether the created volume %d has the pre-populated data", i))
tests := []e2evolume.Test{ tests := []e2evolume.Test{
@ -392,6 +409,7 @@ func (t StorageClassTest) TestDynamicProvisioning() *v1.PersistentVolume {
var podConfig *e2epod.Config = &e2epod.Config{ var podConfig *e2epod.Config = &e2epod.Config{
NS: claim.Namespace, NS: claim.Namespace,
PVCs: []*v1.PersistentVolumeClaim{claim}, PVCs: []*v1.PersistentVolumeClaim{claim},
NodeSelection: t.NodeSelection,
} }
var pod *v1.Pod var pod *v1.Pod