Skip to content

Commit 7c9e567

Browse files
author
caiweidong
committed
add operation name for other volume operations
1 parent 6c22cff commit 7c9e567

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

pkg/volume/util/operationexecutor/operation_generator.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ func (og *operationGenerator) GenerateVolumesAreAttachedFunc(
211211
}
212212

213213
return volumetypes.GeneratedOperations{
214+
OperationName: "verify_volumes_are_attached_per_node",
214215
OperationFunc: volumesAreAttachedFunc,
215216
CompleteFunc: util.OperationCompleteHook(util.GetFullQualifiedPluginNameForVolume("<n/a>", nil), "verify_volumes_are_attached_per_node"),
216217
EventRecorderFunc: nil, // nil because we do not want to generate event on error
@@ -282,6 +283,7 @@ func (og *operationGenerator) GenerateBulkVolumeVerifyFunc(
282283
}
283284

284285
return volumetypes.GeneratedOperations{
286+
OperationName: "verify_volumes_are_attached",
285287
OperationFunc: bulkVolumeVerifyFunc,
286288
CompleteFunc: util.OperationCompleteHook(util.GetFullQualifiedPluginNameForVolume(pluginName, nil), "verify_volumes_are_attached"),
287289
EventRecorderFunc: nil, // nil because we do not want to generate event on error
@@ -388,6 +390,7 @@ func (og *operationGenerator) GenerateAttachVolumeFunc(
388390
}
389391

390392
return volumetypes.GeneratedOperations{
393+
OperationName: "volume_attach",
391394
OperationFunc: attachVolumeFunc,
392395
EventRecorderFunc: eventRecorderFunc,
393396
CompleteFunc: util.OperationCompleteHook(util.GetFullQualifiedPluginNameForVolume(attachableVolumePlugin.GetPluginName(), volumeToAttach.VolumeSpec), "volume_attach"),
@@ -507,6 +510,7 @@ func (og *operationGenerator) GenerateDetachVolumeFunc(
507510
}
508511

509512
return volumetypes.GeneratedOperations{
513+
OperationName: "volume_detach",
510514
OperationFunc: getVolumePluginMgrFunc,
511515
CompleteFunc: util.OperationCompleteHook(util.GetFullQualifiedPluginNameForVolume(pluginName, volumeToDetach.VolumeSpec), "volume_detach"),
512516
EventRecorderFunc: nil, // nil because we do not want to generate event on error
@@ -1093,6 +1097,7 @@ func (og *operationGenerator) GenerateMapVolumeFunc(
10931097
}
10941098

10951099
return volumetypes.GeneratedOperations{
1100+
OperationName: "map_volume",
10961101
OperationFunc: mapVolumeFunc,
10971102
EventRecorderFunc: eventRecorderFunc,
10981103
CompleteFunc: util.OperationCompleteHook(util.GetFullQualifiedPluginNameForVolume(blockVolumePlugin.GetPluginName(), volumeToMount.VolumeSpec), "map_volume"),
@@ -1163,6 +1168,7 @@ func (og *operationGenerator) GenerateUnmapVolumeFunc(
11631168
}
11641169

11651170
return volumetypes.GeneratedOperations{
1171+
OperationName: "unmap_volume",
11661172
OperationFunc: unmapVolumeFunc,
11671173
CompleteFunc: util.OperationCompleteHook(util.GetFullQualifiedPluginNameForVolume(blockVolumePlugin.GetPluginName(), volumeToUnmount.VolumeSpec), "unmap_volume"),
11681174
EventRecorderFunc: nil, // nil because we do not want to generate event on error
@@ -1278,6 +1284,7 @@ func (og *operationGenerator) GenerateUnmapDeviceFunc(
12781284
}
12791285

12801286
return volumetypes.GeneratedOperations{
1287+
OperationName: "unmap_device",
12811288
OperationFunc: unmapDeviceFunc,
12821289
CompleteFunc: util.OperationCompleteHook(util.GetFullQualifiedPluginNameForVolume(blockVolumePlugin.GetPluginName(), deviceToDetach.VolumeSpec), "unmap_device"),
12831290
EventRecorderFunc: nil, // nil because we do not want to generate event on error
@@ -1352,6 +1359,7 @@ func (og *operationGenerator) GenerateVerifyControllerAttachedVolumeFunc(
13521359
}
13531360

13541361
return volumetypes.GeneratedOperations{
1362+
OperationName: "verify_controller_attached_volume",
13551363
OperationFunc: verifyControllerAttachedVolumeFunc,
13561364
CompleteFunc: util.OperationCompleteHook(util.GetFullQualifiedPluginNameForVolume(volumePlugin.GetPluginName(), volumeToMount.VolumeSpec), "verify_controller_attached_volume"),
13571365
EventRecorderFunc: nil, // nil because we do not want to generate event on error
@@ -1468,6 +1476,7 @@ func (og *operationGenerator) GenerateExpandVolumeFunc(
14681476
}
14691477

14701478
return volumetypes.GeneratedOperations{
1479+
OperationName: "expand_volume",
14711480
OperationFunc: expandVolumeFunc,
14721481
EventRecorderFunc: eventRecorderFunc,
14731482
CompleteFunc: util.OperationCompleteHook(util.GetFullQualifiedPluginNameForVolume(volumePlugin.GetPluginName(), volumeSpec), "expand_volume"),
@@ -1542,6 +1551,7 @@ func (og *operationGenerator) GenerateExpandVolumeFSWithoutUnmountingFunc(
15421551
}
15431552

15441553
return volumetypes.GeneratedOperations{
1554+
OperationName: "volume_fs_resize",
15451555
OperationFunc: fsResizeFunc,
15461556
EventRecorderFunc: eventRecorderFunc,
15471557
CompleteFunc: util.OperationCompleteHook(util.GetFullQualifiedPluginNameForVolume(volumePlugin.GetPluginName(), volumeToMount.VolumeSpec), "volume_fs_resize"),

0 commit comments

Comments
 (0)