mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 05:27:21 +00:00
Merge pull request #100185 from drigz/extra-log
Remove EXTRA from log messages
This commit is contained in:
commit
1dc7de0366
@ -929,7 +929,7 @@ func (og *operationGenerator) GenerateUnmountDeviceFunc(
|
|||||||
// If the mount path could not be found, don't fail the unmount, but instead log a warning and proceed,
|
// If the mount path could not be found, don't fail the unmount, but instead log a warning and proceed,
|
||||||
// using the value from deviceToDetach.DeviceMountPath, so that the device can be marked as unmounted
|
// using the value from deviceToDetach.DeviceMountPath, so that the device can be marked as unmounted
|
||||||
deviceMountPath = deviceToDetach.DeviceMountPath
|
deviceMountPath = deviceToDetach.DeviceMountPath
|
||||||
klog.Warningf(deviceToDetach.GenerateMsg(fmt.Sprintf(
|
klog.Warningf(deviceToDetach.GenerateMsgDetailed(fmt.Sprintf(
|
||||||
"GetDeviceMountPath failed, but unmount operation will proceed using deviceMountPath=%s: %v", deviceMountPath, err), ""))
|
"GetDeviceMountPath failed, but unmount operation will proceed using deviceMountPath=%s: %v", deviceMountPath, err), ""))
|
||||||
}
|
}
|
||||||
refs, err := deviceMountableVolumePlugin.GetDeviceMountRefs(deviceMountPath)
|
refs, err := deviceMountableVolumePlugin.GetDeviceMountRefs(deviceMountPath)
|
||||||
@ -971,7 +971,7 @@ func (og *operationGenerator) GenerateUnmountDeviceFunc(
|
|||||||
return volumetypes.NewOperationContext(eventErr, detailedErr, migrated)
|
return volumetypes.NewOperationContext(eventErr, detailedErr, migrated)
|
||||||
}
|
}
|
||||||
|
|
||||||
klog.Infof(deviceToDetach.GenerateMsg("UnmountDevice succeeded", ""))
|
klog.Infof(deviceToDetach.GenerateMsgDetailed("UnmountDevice succeeded", ""))
|
||||||
|
|
||||||
// Update actual state of world
|
// Update actual state of world
|
||||||
markDeviceUnmountedErr := actualStateOfWorld.MarkDeviceAsUnmounted(
|
markDeviceUnmountedErr := actualStateOfWorld.MarkDeviceAsUnmounted(
|
||||||
|
Loading…
Reference in New Issue
Block a user