Fix multierror, switch to original stub path on release

Signed-off-by: bpopovschi <[email protected]>

Author: Zyqsempai

runtime/drive_handler.go

@@ -111,7 +111,7 @@ func (h *StubDriveHandler) Reserve(
 		return ErrDrivesExhausted
 	}
 	if _, ok := h.usedDrives[id]; ok {
-		// This case means that driver wasn't released or removed properly
+		// This case means that drive wasn't released or removed properly
 		return fmt.Errorf("drive with ID %s already in use, a previous attempt to remove it may have failed", id)
 	}
 
@@ -127,6 +127,7 @@ func (h *StubDriveHandler) Reserve(
 		filesystemType,
 		options,
 	)
+	freeDrive = &stubDrive
 
 	err = stubDrive.PatchAndMount(requestCtx, machine, driveMounter)
 	if err != nil {
@@ -161,7 +162,7 @@ func (h *StubDriveHandler) Release(
 		return errors.Wrap(err, "failed to unmount drive")
 	}
 
-	err = machine.UpdateGuestDrive(requestCtx, drive.driveID, drive.driveMount.HostPath)
+	err = machine.UpdateGuestDrive(requestCtx, drive.driveID, drive.stubPath)
 	if err != nil {
 		return errors.Wrap(err, "failed to patch drive")
 	}

runtime/service.go

@@ -926,22 +926,22 @@ func (s *service) Delete(requestCtx context.Context, req *taskAPI.DeleteRequest)
 	// Trying to release stub drive for further reuse
 	err = s.containerStubHandler.Release(requestCtx, req.ID, s.driveMountClient, s.machine)
 	if err != nil {
-		multierror.Append(result, errors.Wrapf(err, "failed to release stub drive for container: %s", req.ID))
+		result = multierror.Append(result, errors.Wrapf(err, "failed to release stub drive for container: %s", req.ID))
 	}
 
 	// Otherwise, delete the container
 	dir, err := s.shimDir.BundleLink(req.ID)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to find the bundle directory of the container: %s", req.ID)
+		result = multierror.Append(result, errors.Wrapf(err, "failed to find the bundle directory of the container: %s", req.ID))
 	}
 
 	_, err = os.Stat(dir.RootPath())
 	if os.IsNotExist(err) {
-		return nil, errors.Wrapf(err, "failed to find the bundle directory of the container: %s", dir.RootPath())
+		result = multierror.Append(result, errors.Wrapf(err, "failed to find the bundle directory of the container: %s", dir.RootPath()))
 	}
 
 	if err = os.Remove(dir.RootPath()); err != nil {
-		return nil, multierror.Append(result, errors.Wrapf(err, "failed to remove the bundle directory of the container: %s", dir.RootPath()))
+		result = multierror.Append(result, errors.Wrapf(err, "failed to remove the bundle directory of the container: %s", dir.RootPath()))
 	}
 
 	return resp, result.ErrorOrNil()