ceph: fail if the pool fails to be deleted

Let's assert if the pool is still present.

Signed-off-by: Sébastien Han <seb@redhat.com>
This commit is contained in:
Sébastien Han committed 2020-07-22 17:25:15 +02:00
1 parent 5a621a1591
commit e517ac96aa
2 files changed
+11 -3

No files matched your search

+7 -1
View File
@@ -22,6 +22,7 @@ import (
"github.com/rook/rook/pkg/daemon/ceph/client"
"github.com/rook/rook/tests/framework/installer"
"github.com/rook/rook/tests/framework/utils"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@@ -85,7 +86,12 @@ func (b *BlockOperation) DeletePVC(namespace, claimName string) error {
func (b *BlockOperation) DeleteStorageClass(storageClassName string) error {
logger.Infof("deleting storage class %q", storageClassName)
return b.k8sClient.Clientset.StorageV1().StorageClasses().Delete(storageClassName, &metav1.DeleteOptions{})
err := b.k8sClient.Clientset.StorageV1().StorageClasses().Delete(storageClassName, &metav1.DeleteOptions{})
if err != nil && !errors.IsNotFound(err) {
return fmt.Errorf("failed to delete storage class %q. %v", storageClassName, err)
}
return nil
}
// BlockDelete Function to delete a Block using Rook
+4 -2
View File
@@ -173,8 +173,10 @@ func (s *CephFlexDriverSuite) statefulSetDataCleanup(poolName, storageClassName,
// Delete all PVCs
s.kh.DeletePvcWithLabel(defaultNamespace, statefulSetName)
// Delete storageclass and pool
s.testClient.PoolClient.DeletePool(s.testClient.BlockClient, s.clusterInfo, poolName)
s.testClient.BlockClient.DeleteStorageClass(storageClassName)
err := s.testClient.PoolClient.DeletePool(s.testClient.BlockClient, s.clusterInfo, poolName)
require.Nil(s.T(), err)
err = s.testClient.BlockClient.DeleteStorageClass(storageClassName)
require.Nil(s.T(), err)
}
func (s *CephFlexDriverSuite) setupPVCs() {