542f2dc708
This commit adds a new volume manager in kubelet that synchronizes volume mount/unmount (and attach/detach, if attach/detach controller is not enabled). This eliminates the race conditions between the pod creation loop and the orphaned volumes loops. It also removes the unmount/detach from the `syncPod()` path so volume clean up never blocks the `syncPod` loop.
136 lines
3.9 KiB
Go
136 lines
3.9 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors All rights reserved.
|
|
|
|
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 kubelet
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
|
|
"k8s.io/kubernetes/pkg/api"
|
|
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
|
|
"k8s.io/kubernetes/pkg/cloudprovider"
|
|
"k8s.io/kubernetes/pkg/types"
|
|
"k8s.io/kubernetes/pkg/util/io"
|
|
"k8s.io/kubernetes/pkg/util/mount"
|
|
"k8s.io/kubernetes/pkg/volume"
|
|
)
|
|
|
|
// NewInitializedVolumePluginMgr returns a new instance of
|
|
// volume.VolumePluginMgr initialized with kubelets implementation of the
|
|
// volume.VolumeHost interface.
|
|
//
|
|
// kubelet - used by VolumeHost methods to expose kubelet specific parameters
|
|
// plugins - used to initialize volumePluginMgr
|
|
func NewInitializedVolumePluginMgr(
|
|
kubelet *Kubelet,
|
|
plugins []volume.VolumePlugin) (*volume.VolumePluginMgr, error) {
|
|
kvh := &kubeletVolumeHost{
|
|
kubelet: kubelet,
|
|
volumePluginMgr: volume.VolumePluginMgr{},
|
|
}
|
|
|
|
if err := kvh.volumePluginMgr.InitPlugins(plugins, kvh); err != nil {
|
|
return nil, fmt.Errorf(
|
|
"Could not initialize volume plugins for KubeletVolumePluginMgr: %v",
|
|
err)
|
|
}
|
|
|
|
return &kvh.volumePluginMgr, nil
|
|
}
|
|
|
|
// Compile-time check to ensure kubeletVolumeHost implements the VolumeHost interface
|
|
var _ volume.VolumeHost = &kubeletVolumeHost{}
|
|
|
|
func (kvh *kubeletVolumeHost) GetPluginDir(pluginName string) string {
|
|
return kvh.kubelet.getPluginDir(pluginName)
|
|
}
|
|
|
|
type kubeletVolumeHost struct {
|
|
kubelet *Kubelet
|
|
volumePluginMgr volume.VolumePluginMgr
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) GetPodVolumeDir(podUID types.UID, pluginName string, volumeName string) string {
|
|
return kvh.kubelet.getPodVolumeDir(podUID, pluginName, volumeName)
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) GetPodPluginDir(podUID types.UID, pluginName string) string {
|
|
return kvh.kubelet.getPodPluginDir(podUID, pluginName)
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) GetKubeClient() internalclientset.Interface {
|
|
return kvh.kubelet.kubeClient
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) NewWrapperMounter(
|
|
volName string,
|
|
spec volume.Spec,
|
|
pod *api.Pod,
|
|
opts volume.VolumeOptions) (volume.Mounter, error) {
|
|
// The name of wrapper volume is set to "wrapped_{wrapped_volume_name}"
|
|
wrapperVolumeName := "wrapped_" + volName
|
|
if spec.Volume != nil {
|
|
spec.Volume.Name = wrapperVolumeName
|
|
}
|
|
|
|
return kvh.kubelet.newVolumeMounterFromPlugins(&spec, pod, opts)
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) NewWrapperUnmounter(volName string, spec volume.Spec, podUID types.UID) (volume.Unmounter, error) {
|
|
// The name of wrapper volume is set to "wrapped_{wrapped_volume_name}"
|
|
wrapperVolumeName := "wrapped_" + volName
|
|
if spec.Volume != nil {
|
|
spec.Volume.Name = wrapperVolumeName
|
|
}
|
|
|
|
plugin, err := kvh.kubelet.volumePluginMgr.FindPluginBySpec(&spec)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return plugin.NewUnmounter(spec.Name(), podUID)
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) GetCloudProvider() cloudprovider.Interface {
|
|
return kvh.kubelet.cloud
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) GetMounter() mount.Interface {
|
|
return kvh.kubelet.mounter
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) GetWriter() io.Writer {
|
|
return kvh.kubelet.writer
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) GetHostName() string {
|
|
return kvh.kubelet.hostname
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) GetHostIP() (net.IP, error) {
|
|
return kvh.kubelet.GetHostIP()
|
|
}
|
|
|
|
func (kvh *kubeletVolumeHost) GetRootContext() string {
|
|
rootContext, err := kvh.kubelet.getRootDirContext()
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
|
|
return rootContext
|
|
}
|