storaged: only delete the qgroup associated with a volume

Author: zaibon

pkg/storage/filesystem/btrfs.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 
 	"github.com/threefoldtech/zos/pkg"
@@ -337,21 +338,20 @@ func (p *btrfsPool) AddVolume(name string) (Volume, error) {
 func (p *btrfsPool) removeVolume(root string) error {
 	ctx := context.Background()
 
-	if err := p.utils.SubvolumeRemove(ctx, root); err != nil {
+	info, err := p.utils.SubvolumeInfo(ctx, root)
+	if err != nil {
 		return err
 	}
 
-	qgroups, err := p.utils.QGroupList(ctx, root)
-	if err != nil {
+	if err := p.utils.SubvolumeRemove(ctx, root); err != nil {
 		return err
 	}
 
-	for _, qgroup := range qgroups {
-		log.Debug().Msgf("delete qgroup %s", qgroup.ID)
-		if err := p.utils.QGroupDestroy(ctx, qgroup.ID, root); err != nil {
-			return err
-		}
+	qgroupID := fmt.Sprintf("0/%d", info.ID)
+	if err := p.utils.QGroupDestroy(ctx, qgroupID, p.Path()); err != nil {
+		return errors.Wrapf(err, "failed to delete qgroup %s", qgroupID)
 	}
+
 	return nil
 }
 

pkg/storage/filesystem/btrfs_ci_test.go

@@ -302,8 +302,8 @@ func TestCLeanUpQgroupsCI(t *testing.T) {
 
 	devices, err := SetupDevices(1)
 	require.NoError(t, err, "failed to initialize devices")
-
 	defer devices.Destroy()
+
 	loops := devices.Loops()
 	fs := NewBtrfs(&TestDeviceManager{loops})
 
@@ -326,6 +326,7 @@ func TestCLeanUpQgroupsCI(t *testing.T) {
 
 	volume, err := pool.AddVolume("vol1")
 	require.NoError(t, err)
+	t.Logf("volume ID: %v\n", volume.ID())
 
 	err = volume.Limit(256 * 1024 * 1024)
 	require.NoError(t, err)
@@ -336,6 +337,7 @@ func TestCLeanUpQgroupsCI(t *testing.T) {
 	qgroups, err := btrfsVol.utils.QGroupList(context.TODO(), pool.Path())
 	require.NoError(t, err)
 	assert.Equal(t, 2, len(qgroups))
+	t.Logf("qgroups before delete: %v", qgroups)
 
 	_, ok = qgroups[fmt.Sprintf("0/%d", btrfsVol.id)]
 	assert.True(t, ok, "qgroups should contains a qgroup linked to the subvolume")
@@ -345,5 +347,7 @@ func TestCLeanUpQgroupsCI(t *testing.T) {
 
 	qgroups, err = btrfsVol.utils.QGroupList(context.TODO(), pool.Path())
 	require.NoError(t, err)
-	assert.Equal(t, 0, len(qgroups), "qgroups should have been deleted with the subvolume")
+
+	t.Logf("remaining qgroups: %+v", qgroups)
+	assert.Equal(t, 1, len(qgroups), "qgroups should have been deleted with the subvolume")
 }