Skip to content

Commit 143b896

Browse files
committed
Resolved review comments
1 parent 5499dfe commit 143b896

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/cloud/powervs.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,9 @@ func (p *powerVSCloud) CloneDisk(sourceVolumeID string, cloneVolumeName string)
234234
if err != nil {
235235
return nil, err
236236
}
237+
if len(clonedVolumeDetails.ClonedVolumes) == 0 {
238+
return nil, errors.New("cloned volume not found")
239+
}
237240
clonedVolumeID := clonedVolumeDetails.ClonedVolumes[0].ClonedVolumeID
238241
err = p.WaitForVolumeState(clonedVolumeID, VolumeAvailableState)
239242
if err != nil {
@@ -255,18 +258,15 @@ func (p *powerVSCloud) WaitForVolumeState(volumeID, state string) error {
255258
}
256259

257260
func (p *powerVSCloud) WaitForCloneStatus(cloneTaskId string) error {
258-
err := wait.PollImmediate(PollInterval, PollTimeout, func() (bool, error) {
261+
ctx := context.Background()
262+
return wait.PollUntilContextTimeout(ctx, PollInterval, PollTimeout, true, func(ctx context.Context) (bool, error) {
259263
c, err := p.cloneVolumeClient.Get(cloneTaskId)
260264
if err != nil {
261265
return false, err
262266
}
263267
spew.Dump(*c)
264268
return *c.Status == "completed", nil
265269
})
266-
if err != nil {
267-
return err
268-
}
269-
return nil
270270
}
271271

272272
func (p *powerVSCloud) GetDiskByName(name string) (disk *Disk, err error) {

0 commit comments

Comments
 (0)