453f81d1ca
This allows us to return with a timeout error as soon as the context is canceled. Previously in cases where the mount will never succeed pods can get stuck deleting for 2 minutes. In the Sync*Pod methods that call VolumeManager.WaitFor*, we must filter out wait.Interrupted errors from being logged as they are part of control flow, not runtime problems. Any early interruption should result in exiting the Sync*Pod method as quickly as possible without logging intermediate errors.
112 lines
3.3 KiB
Go
112 lines
3.3 KiB
Go
/*
|
|
Copyright 2019 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package volumemanager
|
|
|
|
import (
|
|
"context"
|
|
|
|
v1 "k8s.io/api/core/v1"
|
|
"k8s.io/kubernetes/pkg/kubelet/config"
|
|
"k8s.io/kubernetes/pkg/kubelet/container"
|
|
"k8s.io/kubernetes/pkg/volume/util/types"
|
|
)
|
|
|
|
// FakeVolumeManager is a test implementation that just tracks calls
|
|
type FakeVolumeManager struct {
|
|
volumes map[v1.UniqueVolumeName]bool
|
|
reportedInUse map[v1.UniqueVolumeName]bool
|
|
}
|
|
|
|
// NewFakeVolumeManager creates a new VolumeManager test instance
|
|
func NewFakeVolumeManager(initialVolumes []v1.UniqueVolumeName) *FakeVolumeManager {
|
|
volumes := map[v1.UniqueVolumeName]bool{}
|
|
for _, v := range initialVolumes {
|
|
volumes[v] = true
|
|
}
|
|
return &FakeVolumeManager{
|
|
volumes: volumes,
|
|
reportedInUse: map[v1.UniqueVolumeName]bool{},
|
|
}
|
|
}
|
|
|
|
// Run is not implemented
|
|
func (f *FakeVolumeManager) Run(sourcesReady config.SourcesReady, stopCh <-chan struct{}) {
|
|
}
|
|
|
|
// WaitForAttachAndMount is not implemented
|
|
func (f *FakeVolumeManager) WaitForAttachAndMount(ctx context.Context, pod *v1.Pod) error {
|
|
return nil
|
|
}
|
|
|
|
// WaitForUnmount is not implemented
|
|
func (f *FakeVolumeManager) WaitForUnmount(ctx context.Context, pod *v1.Pod) error {
|
|
return nil
|
|
}
|
|
|
|
// GetMountedVolumesForPod is not implemented
|
|
func (f *FakeVolumeManager) GetMountedVolumesForPod(podName types.UniquePodName) container.VolumeMap {
|
|
return nil
|
|
}
|
|
|
|
// GetPossiblyMountedVolumesForPod is not implemented
|
|
func (f *FakeVolumeManager) GetPossiblyMountedVolumesForPod(podName types.UniquePodName) container.VolumeMap {
|
|
return nil
|
|
}
|
|
|
|
// GetExtraSupplementalGroupsForPod is not implemented
|
|
func (f *FakeVolumeManager) GetExtraSupplementalGroupsForPod(pod *v1.Pod) []int64 {
|
|
return nil
|
|
}
|
|
|
|
// GetVolumesInUse returns a list of the initial volumes
|
|
func (f *FakeVolumeManager) GetVolumesInUse() []v1.UniqueVolumeName {
|
|
inuse := []v1.UniqueVolumeName{}
|
|
for v := range f.volumes {
|
|
inuse = append(inuse, v)
|
|
}
|
|
return inuse
|
|
}
|
|
|
|
// ReconcilerStatesHasBeenSynced is not implemented
|
|
func (f *FakeVolumeManager) ReconcilerStatesHasBeenSynced() bool {
|
|
return true
|
|
}
|
|
|
|
// VolumeIsAttached is not implemented
|
|
func (f *FakeVolumeManager) VolumeIsAttached(volumeName v1.UniqueVolumeName) bool {
|
|
return false
|
|
}
|
|
|
|
// MarkVolumesAsReportedInUse adds the given volumes to the reportedInUse map
|
|
func (f *FakeVolumeManager) MarkVolumesAsReportedInUse(volumesReportedAsInUse []v1.UniqueVolumeName) {
|
|
for _, reportedVolume := range volumesReportedAsInUse {
|
|
if _, ok := f.volumes[reportedVolume]; ok {
|
|
f.reportedInUse[reportedVolume] = true
|
|
}
|
|
}
|
|
}
|
|
|
|
// GetVolumesReportedInUse is a test function only that returns a list of volumes
|
|
// from the reportedInUse map
|
|
func (f *FakeVolumeManager) GetVolumesReportedInUse() []v1.UniqueVolumeName {
|
|
inuse := []v1.UniqueVolumeName{}
|
|
for reportedVolume := range f.reportedInUse {
|
|
inuse = append(inuse, reportedVolume)
|
|
}
|
|
return inuse
|
|
}
|