Просмотр исходного кода

Fix returning errors from snapshotter.Prepare

In the case of an error when calling snapshotter.Prepare we would return
nil. This change fixes that and returns the error from Prepare all the
time.

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
Djordje Lukic 2 лет назад
Родитель
Сommit
bc37e3f830
1 измененных файлов с 2 добавлено и 5 удалено
  1. 2 5
      daemon/containerd/image_snapshot.go

+ 2 - 5
daemon/containerd/image_snapshot.go

@@ -51,9 +51,6 @@ func (i *ImageService) PrepareSnapshot(ctx context.Context, id string, parentIma
 	}
 
 	s := i.client.SnapshotService(i.StorageDriver())
-	if _, err := s.Prepare(ctx, id, parent); err == nil {
-		return err
-	}
-
-	return nil
+	_, err = s.Prepare(ctx, id, parent)
+	return err
 }