github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 19:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Rename MarkVolumeMountedOpts to MarkVolumeOpts

Browse Source 
Also remove VolumeNotMounted state
This commit is contained in:
Hemant Kumar 2019-11-11 18:27:54 -05:00
parent cdbd3ba5c2
commit 5feea93163
8 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/volumemanager/cache/actual_state_of_world.go vendored
View File

@ -59,7 +59,7 @@ type ActualStateOfWorld interface {
// volume, reset the pod's remountRequired value. // volume, reset the pod's remountRequired value.
// If a volume with the name volumeName does not exist in the list of // If a volume with the name volumeName does not exist in the list of
// attached volumes, an error is returned. // attached volumes, an error is returned.
AddPodToVolume(operationexecutor.MarkVolumeMountedOpts) error AddPodToVolume(operationexecutor.MarkVolumeOpts) error
// MarkRemountRequired marks each volume that is successfully attached and // MarkRemountRequired marks each volume that is successfully attached and
// mounted for the specified pod as requiring remount (if the plugin for the // mounted for the specified pod as requiring remount (if the plugin for the
@ -313,7 +313,6 @@ type mountedPod struct {
// volumeMountStateForPod stores state of volume mount for the pod. if it is: // volumeMountStateForPod stores state of volume mount for the pod. if it is:
// - VolumeMounted: means volume for pod has been successfully mounted // - VolumeMounted: means volume for pod has been successfully mounted
// - VolumeMountUncertain: means volume for pod may not be mounted, but it must be unmounted // - VolumeMountUncertain: means volume for pod may not be mounted, but it must be unmounted
// - VolumeNotMounted: means volume for pod has not been mounted
volumeMountStateForPod operationexecutor.VolumeMountState volumeMountStateForPod operationexecutor.VolumeMountState
} }
@ -332,7 +331,7 @@ func (asw *actualStateOfWorld) MarkVolumeAsDetached(
asw.DeleteVolume(volumeName) asw.DeleteVolume(volumeName)
} }
func (asw *actualStateOfWorld) MarkVolumeAsMounted(markVolumeOpts operationexecutor.MarkVolumeMountedOpts) error { func (asw *actualStateOfWorld) MarkVolumeAsMounted(markVolumeOpts operationexecutor.MarkVolumeOpts) error {
return asw.AddPodToVolume(markVolumeOpts) return asw.AddPodToVolume(markVolumeOpts)
} }
@ -360,7 +359,7 @@ func (asw *actualStateOfWorld) MarkDeviceAsUncertain(
return asw.SetDeviceMountState(volumeName, operationexecutor.DeviceMountUncertain, devicePath, deviceMountPath) return asw.SetDeviceMountState(volumeName, operationexecutor.DeviceMountUncertain, devicePath, deviceMountPath)
} }
func (asw *actualStateOfWorld) MarkVolumeMountAsUncertain(markVolumeOpts operationexecutor.MarkVolumeMountedOpts) error { func (asw *actualStateOfWorld) MarkVolumeMountAsUncertain(markVolumeOpts operationexecutor.MarkVolumeOpts) error {
markVolumeOpts.VolumeMountState = operationexecutor.VolumeMountUncertain markVolumeOpts.VolumeMountState = operationexecutor.VolumeMountUncertain
return asw.AddPodToVolume(markVolumeOpts) return asw.AddPodToVolume(markVolumeOpts)
} }
@ -428,7 +427,7 @@ func (asw *actualStateOfWorld) addVolume(
return nil return nil
} }
func (asw *actualStateOfWorld) AddPodToVolume(markVolumeOpts operationexecutor.MarkVolumeMountedOpts) error { func (asw *actualStateOfWorld) AddPodToVolume(markVolumeOpts operationexecutor.MarkVolumeOpts) error {
podName := markVolumeOpts.PodName podName := markVolumeOpts.PodName
podUID := markVolumeOpts.PodUID podUID := markVolumeOpts.PodUID
volumeName := markVolumeOpts.VolumeName volumeName := markVolumeOpts.VolumeName

12
pkg/kubelet/volumemanager/cache/actual_state_of_world_test.go vendored
View File

@ -221,7 +221,7 @@ func Test_AddPodToVolume_Positive_ExistingVolumeNewNode(t *testing.T) {
} }
// Act // Act
markVolumeOpts := operationexecutor.MarkVolumeMountedOpts{ markVolumeOpts := operationexecutor.MarkVolumeOpts{
PodName: podName, PodName: podName,
PodUID: pod.UID, PodUID: pod.UID,
VolumeName: generatedVolumeName, VolumeName: generatedVolumeName,
@ -295,7 +295,7 @@ func Test_AddPodToVolume_Positive_ExistingVolumeExistingNode(t *testing.T) {
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err) t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
} }
markVolumeOpts := operationexecutor.MarkVolumeMountedOpts{ markVolumeOpts := operationexecutor.MarkVolumeOpts{
PodName: podName, PodName: podName,
PodUID: pod.UID, PodUID: pod.UID,
VolumeName: generatedVolumeName, VolumeName: generatedVolumeName,
@ -402,7 +402,7 @@ func Test_AddTwoPodsToVolume_Positive(t *testing.T) {
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err) t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
} }
markVolumeOpts1 := operationexecutor.MarkVolumeMountedOpts{ markVolumeOpts1 := operationexecutor.MarkVolumeOpts{
PodName: podName1, PodName: podName1,
PodUID: pod1.UID, PodUID: pod1.UID,
VolumeName: generatedVolumeName1, VolumeName: generatedVolumeName1,
@ -428,7 +428,7 @@ func Test_AddTwoPodsToVolume_Positive(t *testing.T) {
t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err) t.Fatalf("NewBlockVolumeMapper failed. Expected: <no error> Actual: <%v>", err)
} }
markVolumeOpts2 := operationexecutor.MarkVolumeMountedOpts{ markVolumeOpts2 := operationexecutor.MarkVolumeOpts{
PodName: podName2, PodName: podName2,
PodUID: pod2.UID, PodUID: pod2.UID,
VolumeName: generatedVolumeName1, VolumeName: generatedVolumeName1,
@ -513,7 +513,7 @@ func Test_AddPodToVolume_Negative_VolumeDoesntExist(t *testing.T) {
} }
// Act // Act
markVolumeOpts := operationexecutor.MarkVolumeMountedOpts{ markVolumeOpts := operationexecutor.MarkVolumeOpts{
PodName: podName, PodName: podName,
PodUID: pod.UID, PodUID: pod.UID,
VolumeName: volumeName, VolumeName: volumeName,
@ -632,7 +632,7 @@ func TestUncertainVolumeMounts(t *testing.T) {
t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err) t.Fatalf("NewMounter failed. Expected: <no error> Actual: <%v>", err)
} }
markVolumeOpts1 := operationexecutor.MarkVolumeMountedOpts{ markVolumeOpts1 := operationexecutor.MarkVolumeOpts{
PodName: podName1, PodName: podName1,
PodUID: pod1.UID, PodUID: pod1.UID,
VolumeName: generatedVolumeName1, VolumeName: generatedVolumeName1,

2
pkg/kubelet/volumemanager/metrics/metrics_test.go
View File

@ -78,7 +78,7 @@ func TestMetricCollection(t *testing.T) {
t.Fatalf("MarkVolumeAsAttached failed. Expected: <no error> Actual: <%v>", err) t.Fatalf("MarkVolumeAsAttached failed. Expected: <no error> Actual: <%v>", err)
} }
markVolumeOpts := operationexecutor.MarkVolumeMountedOpts{ markVolumeOpts := operationexecutor.MarkVolumeOpts{
PodName: podName, PodName: podName,
PodUID: pod.UID, PodUID: pod.UID,
VolumeName: generatedVolumeName, VolumeName: generatedVolumeName,

2
pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go
View File

@ -855,7 +855,7 @@ func reconcileASW(asw cache.ActualStateOfWorld, dsw cache.DesiredStateOfWorld, t
if err != nil { if err != nil {
t.Fatalf("Unexpected error when MarkVolumeAsAttached: %v", err) t.Fatalf("Unexpected error when MarkVolumeAsAttached: %v", err)
} }
markVolumeOpts := operationexecutor.MarkVolumeMountedOpts{ markVolumeOpts := operationexecutor.MarkVolumeOpts{
PodName: volumeToMount.PodName, PodName: volumeToMount.PodName,
PodUID: volumeToMount.Pod.UID, PodUID: volumeToMount.Pod.UID,
VolumeName: volumeToMount.VolumeName, VolumeName: volumeToMount.VolumeName,

2
pkg/kubelet/volumemanager/reconciler/reconciler.go
View File

@ -640,7 +640,7 @@ func (rc *reconciler) updateStates(volumesNeedUpdate map[v1.UniqueVolumeName]*re
klog.Errorf("Could not add volume information to actual state of world: %v", err) klog.Errorf("Could not add volume information to actual state of world: %v", err)
continue continue
} }
markVolumeOpts := operationexecutor.MarkVolumeMountedOpts{ markVolumeOpts := operationexecutor.MarkVolumeOpts{
PodName: volume.podName, PodName: volume.podName,
PodUID: types.UID(volume.podName), PodUID: types.UID(volume.podName),
VolumeName: volume.volumeName, VolumeName: volume.volumeName,

1
pkg/volume/csi/csi_mounter.go
View File

@ -126,6 +126,7 @@ func (c *csiMountMgr) setupUtil(dir string, mounterArgs volume.MounterArgs) (vol
csi, err := c.csiClientGetter.Get() csi, err := c.csiClientGetter.Get()
if err != nil { if err != nil {
opExitStatus = volumetypes.OperationStateNoChange
return opExitStatus, errors.New(log("mounter.SetUpAt failed to get CSI client: %v", err)) return opExitStatus, errors.New(log("mounter.SetUpAt failed to get CSI client: %v", err))
} }
ctx, cancel := context.WithTimeout(context.Background(), csiTimeout) ctx, cancel := context.WithTimeout(context.Background(), csiTimeout)

11
pkg/volume/util/operationexecutor/operation_executor.go
View File

@ -160,8 +160,8 @@ func NewOperationExecutor(
} }
} }
// MarkVolumeMountedOpts is an struct to pass arguments to MountVolume functions // MarkVolumeOpts is an struct to pass arguments to MountVolume functions
type MarkVolumeMountedOpts struct { type MarkVolumeOpts struct {
PodName volumetypes.UniquePodName PodName volumetypes.UniquePodName
PodUID types.UID PodUID types.UID
VolumeName v1.UniqueVolumeName VolumeName v1.UniqueVolumeName
@ -177,13 +177,13 @@ type MarkVolumeMountedOpts struct {
// state of the world cache after successful mount/unmount. // state of the world cache after successful mount/unmount.
type ActualStateOfWorldMounterUpdater interface { type ActualStateOfWorldMounterUpdater interface {
// Marks the specified volume as mounted to the specified pod // Marks the specified volume as mounted to the specified pod
MarkVolumeAsMounted(markVolumeOpts MarkVolumeMountedOpts) error MarkVolumeAsMounted(markVolumeOpts MarkVolumeOpts) error
// Marks the specified volume as unmounted from the specified pod // Marks the specified volume as unmounted from the specified pod
MarkVolumeAsUnmounted(podName volumetypes.UniquePodName, volumeName v1.UniqueVolumeName) error MarkVolumeAsUnmounted(podName volumetypes.UniquePodName, volumeName v1.UniqueVolumeName) error
// MarkVolumeMountAsUncertain marks state of volume mount for the pod uncertain // MarkVolumeMountAsUncertain marks state of volume mount for the pod uncertain
MarkVolumeMountAsUncertain(markVolumeOpts MarkVolumeMountedOpts) error MarkVolumeMountAsUncertain(markVolumeOpts MarkVolumeOpts) error
// Marks the specified volume as having been globally mounted. // Marks the specified volume as having been globally mounted.
MarkDeviceAsMounted(volumeName v1.UniqueVolumeName, devicePath, deviceMountPath string) error MarkDeviceAsMounted(volumeName v1.UniqueVolumeName, devicePath, deviceMountPath string) error
@ -397,9 +397,6 @@ const (
// VolumeMountUncertain means volume may or may not be mounted in pods' local path // VolumeMountUncertain means volume may or may not be mounted in pods' local path
VolumeMountUncertain VolumeMountState = "VolumeMountUncertain" VolumeMountUncertain VolumeMountState = "VolumeMountUncertain"
// VolumeNotMounted means volume has not been mounted in pod's local path
VolumeNotMounted VolumeMountState = "VolumeNotMounted"
) )
// GenerateMsgDetailed returns detailed msgs for volumes to mount // GenerateMsgDetailed returns detailed msgs for volumes to mount

5
pkg/volume/util/operationexecutor/operation_generator.go
View File

@ -634,7 +634,7 @@ func (og *operationGenerator) GenerateMountVolumeFunc(
DesiredSize: volumeToMount.DesiredSizeLimit, DesiredSize: volumeToMount.DesiredSizeLimit,
}) })
// Update actual state of world // Update actual state of world
markOpts := MarkVolumeMountedOpts{ markOpts := MarkVolumeOpts{
PodName: volumeToMount.PodName, PodName: volumeToMount.PodName,
PodUID: volumeToMount.Pod.UID, PodUID: volumeToMount.Pod.UID,
VolumeName: volumeToMount.VolumeName, VolumeName: volumeToMount.VolumeName,
@ -653,7 +653,6 @@ func (og *operationGenerator) GenerateMountVolumeFunc(
klog.Errorf(volumeToMount.GenerateErrorDetailed("MountVolume.MarkVolumeMountAsUncertain failed", t).Error()) klog.Errorf(volumeToMount.GenerateErrorDetailed("MountVolume.MarkVolumeMountAsUncertain failed", t).Error())
} }
case volumetypes.OperationFinished: case volumetypes.OperationFinished:
markOpts.VolumeMountState = VolumeNotMounted
t := actualStateOfWorld.MarkVolumeAsUnmounted(volumeToMount.PodName, volumeToMount.VolumeName) t := actualStateOfWorld.MarkVolumeAsUnmounted(volumeToMount.PodName, volumeToMount.VolumeName)
if t != nil { if t != nil {
klog.Errorf(volumeToMount.GenerateErrorDetailed("MountVolume.MarkVolumeAsUnmounted failed", t).Error()) klog.Errorf(volumeToMount.GenerateErrorDetailed("MountVolume.MarkVolumeAsUnmounted failed", t).Error())
@ -1021,7 +1020,7 @@ func (og *operationGenerator) GenerateMapVolumeFunc(
return volumeToMount.GenerateError("MapVolume.MarkVolumeAsMounted failed while expanding volume", resizeError) return volumeToMount.GenerateError("MapVolume.MarkVolumeAsMounted failed while expanding volume", resizeError)
} }
markVolumeOpts := MarkVolumeMountedOpts{ markVolumeOpts := MarkVolumeOpts{
PodName: volumeToMount.PodName, PodName: volumeToMount.PodName,
PodUID: volumeToMount.Pod.UID, PodUID: volumeToMount.Pod.UID,
VolumeName: volumeToMount.VolumeName, VolumeName: volumeToMount.VolumeName,