diff mbox

Btrfs: do not create empty block group if we have allocated data

Message ID 1450146572-22383-1-git-send-email-bo.li.liu@oracle.com (mailing list archive)
State Accepted
Headers show

Commit Message

Liu Bo Dec. 15, 2015, 2:29 a.m. UTC
Now we force to create empty block group to keep data profile alive,
however, in the below example, we eventually get an empty block group
while we're trying to get more space for other types (metadata/system),

- Before,
block group "A": size=2G, used=1.2G
block group "B": size=2G, used=512M

- After "btrfs balance start -dusage=50 mount_point",
block group "A": size=2G, used=(1.2+0.5)G
block group "C": size=2G, used=0

Since there is no data in block group C, it won't be deleted
automatically and we have to get the unused 2G until the next mount.

Balance itself just moves data and doesn't remove data, so it's safe
to not create such a empty block group if we already have data
 allocated in other block groups.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
---
 fs/btrfs/volumes.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

Comments

David Sterba April 11, 2016, 3:02 p.m. UTC | #1
On Mon, Dec 14, 2015 at 06:29:32PM -0800, Liu Bo wrote:
> Now we force to create empty block group to keep data profile alive,
> however, in the below example, we eventually get an empty block group
> while we're trying to get more space for other types (metadata/system),
> 
> - Before,
> block group "A": size=2G, used=1.2G
> block group "B": size=2G, used=512M
> 
> - After "btrfs balance start -dusage=50 mount_point",
> block group "A": size=2G, used=(1.2+0.5)G
> block group "C": size=2G, used=0
> 
> Since there is no data in block group C, it won't be deleted
> automatically and we have to get the unused 2G until the next mount.
> 
> Balance itself just moves data and doesn't remove data, so it's safe
> to not create such a empty block group if we already have data
>  allocated in other block groups.
> 
> Signed-off-by: Liu Bo <bo.li.liu@oracle.com>

I'm adding the patch to my for-next.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Liu Bo April 12, 2016, 5:03 p.m. UTC | #2
On Mon, Apr 11, 2016 at 05:02:18PM +0200, David Sterba wrote:
> On Mon, Dec 14, 2015 at 06:29:32PM -0800, Liu Bo wrote:
> > Now we force to create empty block group to keep data profile alive,
> > however, in the below example, we eventually get an empty block group
> > while we're trying to get more space for other types (metadata/system),
> > 
> > - Before,
> > block group "A": size=2G, used=1.2G
> > block group "B": size=2G, used=512M
> > 
> > - After "btrfs balance start -dusage=50 mount_point",
> > block group "A": size=2G, used=(1.2+0.5)G
> > block group "C": size=2G, used=0
> > 
> > Since there is no data in block group C, it won't be deleted
> > automatically and we have to get the unused 2G until the next mount.
> > 
> > Balance itself just moves data and doesn't remove data, so it's safe
> > to not create such a empty block group if we already have data
> >  allocated in other block groups.
> > 
> > Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
> 
> I'm adding the patch to my for-next.

Thank you, David.

Thanks,

-liubo
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 4564522..14139c9 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3400,6 +3400,7 @@  static int __btrfs_balance(struct btrfs_fs_info *fs_info)
 	u32 count_meta = 0;
 	u32 count_sys = 0;
 	int chunk_reserved = 0;
+	u64 bytes_used = 0;
 
 	/* step one make some room on all the devices */
 	devices = &fs_info->fs_devices->devices;
@@ -3538,7 +3539,13 @@  again:
 			goto loop;
 		}
 
-		if ((chunk_type & BTRFS_BLOCK_GROUP_DATA) && !chunk_reserved) {
+		ASSERT(fs_info->data_sinfo);
+		spin_lock(&fs_info->data_sinfo->lock);
+		bytes_used = fs_info->data_sinfo->bytes_used;
+		spin_unlock(&fs_info->data_sinfo->lock);
+
+		if ((chunk_type & BTRFS_BLOCK_GROUP_DATA) &&
+		    !chunk_reserved && !bytes_used) {
 			trans = btrfs_start_transaction(chunk_root, 0);
 			if (IS_ERR(trans)) {
 				mutex_unlock(&fs_info->delete_unused_bgs_mutex);