[PATCH v2] btrfs-progs: balance: print warn mesg in old command

[PATCH v2] btrfs-progs: balance: print warn mesg in old command

[Sidong Yang]

This patch makes old balance command to print warning message same as
in start command. It makes do_balance() checks flags that needs to
print warning message. It works in old command because old command also
uses do_balance().

Issue: #411

Signed-off-by: Sidong Yang <realwakka@gmail.com>
---
v2:
 - Prints warning message in do_balance()
---
 cmds/balance.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/cmds/balance.c b/cmds/balance.c
index 7abc69d9..2e903b5c 100644
--- a/cmds/balance.c
+++ b/cmds/balance.c
@@ -322,6 +322,24 @@ static int do_balance(const char *path, struct btrfs_ioctl_balance_args *args,
 		return 1;
 	}
 
+	if (!(flags & BALANCE_START_FILTERS) && !(flags & BALANCE_START_NOWARN)) {
+		int delay = 10;
+
+		printf("WARNING:\n\n");
+		printf("\tFull balance without filters requested. This operation is very\n");
+		printf("\tintense and takes potentially very long. It is recommended to\n");
+		printf("\tuse the balance filters to narrow down the scope of balance.\n");
+		printf("\tUse 'btrfs balance start --full-balance' option to skip this\n");
+		printf("\twarning. The operation will start in %d seconds.\n", delay);
+		printf("\tUse Ctrl-C to stop it.\n");
+		while (delay) {
+			printf("%2d", delay--);
+			fflush(stdout);
+			sleep(1);
+		}
+		printf("\nStarting balance without any filters.\n");
+	}
+
 	ret = ioctl(fd, BTRFS_IOC_BALANCE_V2, args);
 	if (ret < 0) {
 		/*
@@ -547,24 +565,6 @@ static int cmd_balance_start(const struct cmd_struct *cmd,
 		printf("\nStarting conversion to RAID5/6.\n");
 	}
 
-	if (!(start_flags & BALANCE_START_FILTERS) && !(start_flags & BALANCE_START_NOWARN)) {
-		int delay = 10;
-
-		printf("WARNING:\n\n");
-		printf("\tFull balance without filters requested. This operation is very\n");
-		printf("\tintense and takes potentially very long. It is recommended to\n");
-		printf("\tuse the balance filters to narrow down the scope of balance.\n");
-		printf("\tUse 'btrfs balance start --full-balance' option to skip this\n");
-		printf("\twarning. The operation will start in %d seconds.\n", delay);
-		printf("\tUse Ctrl-C to stop it.\n");
-		while (delay) {
-			printf("%2d", delay--);
-			fflush(stdout);
-			sleep(1);
-		}
-		printf("\nStarting balance without any filters.\n");
-	}
-
 	if (force)
 		args.flags |= BTRFS_BALANCE_FORCE;
 	if (bconf.verbose > BTRFS_BCONF_QUIET)
-- 
2.25.1

Re: [PATCH v2] btrfs-progs: balance: print warn mesg in old command

[Qu Wenruo]

On 2021/10/31 21:10, Sidong Yang wrote:
> This patch makes old balance command to print warning message same as
> in start command. It makes do_balance() checks flags that needs to
> print warning message. It works in old command because old command also
> uses do_balance().
>
> Issue: #411
>
> Signed-off-by: Sidong Yang <realwakka@gmail.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu
> ---
> v2:
>   - Prints warning message in do_balance()
> ---
>   cmds/balance.c | 36 ++++++++++++++++++------------------
>   1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/cmds/balance.c b/cmds/balance.c
> index 7abc69d9..2e903b5c 100644
> --- a/cmds/balance.c
> +++ b/cmds/balance.c
> @@ -322,6 +322,24 @@ static int do_balance(const char *path, struct btrfs_ioctl_balance_args *args,
>   		return 1;
>   	}
>
> +	if (!(flags & BALANCE_START_FILTERS) && !(flags & BALANCE_START_NOWARN)) { > +		int delay = 10;
> +
> +		printf("WARNING:\n\n");
> +		printf("\tFull balance without filters requested. This operation is very\n");
> +		printf("\tintense and takes potentially very long. It is recommended to\n");
> +		printf("\tuse the balance filters to narrow down the scope of balance.\n");
> +		printf("\tUse 'btrfs balance start --full-balance' option to skip this\n");
> +		printf("\twarning. The operation will start in %d seconds.\n", delay);
> +		printf("\tUse Ctrl-C to stop it.\n");
> +		while (delay) {
> +			printf("%2d", delay--);
> +			fflush(stdout);
> +			sleep(1);
> +		}
> +		printf("\nStarting balance without any filters.\n");
> +	}
> +
>   	ret = ioctl(fd, BTRFS_IOC_BALANCE_V2, args);
>   	if (ret < 0) {
>   		/*
> @@ -547,24 +565,6 @@ static int cmd_balance_start(const struct cmd_struct *cmd,
>   		printf("\nStarting conversion to RAID5/6.\n");
>   	}
>
> -	if (!(start_flags & BALANCE_START_FILTERS) && !(start_flags & BALANCE_START_NOWARN)) {
> -		int delay = 10;
> -
> -		printf("WARNING:\n\n");
> -		printf("\tFull balance without filters requested. This operation is very\n");
> -		printf("\tintense and takes potentially very long. It is recommended to\n");
> -		printf("\tuse the balance filters to narrow down the scope of balance.\n");
> -		printf("\tUse 'btrfs balance start --full-balance' option to skip this\n");
> -		printf("\twarning. The operation will start in %d seconds.\n", delay);
> -		printf("\tUse Ctrl-C to stop it.\n");
> -		while (delay) {
> -			printf("%2d", delay--);
> -			fflush(stdout);
> -			sleep(1);
> -		}
> -		printf("\nStarting balance without any filters.\n");
> -	}
> -
>   	if (force)
>   		args.flags |= BTRFS_BALANCE_FORCE;
>   	if (bconf.verbose > BTRFS_BCONF_QUIET)
>

Re: [PATCH v2] btrfs-progs: balance: print warn mesg in old command

[David Sterba]

On Sun, Oct 31, 2021 at 01:10:11PM +0000, Sidong Yang wrote:
> This patch makes old balance command to print warning message same as
> in start command. It makes do_balance() checks flags that needs to
> print warning message. It works in old command because old command also
> uses do_balance().
> 
> Issue: #411
> 
> Signed-off-by: Sidong Yang <realwakka@gmail.com>
> ---
> v2:
>  - Prints warning message in do_balance()

Added to devel and queued for 5.15, thanks.

Re: [PATCH v2] btrfs-progs: balance: print warn mesg in old command

[Wang Yugui]

Hi,

This patch broken tests/cli-tests/002-balance-full-no-filters.

becasue this
	printf("WARNING:\n\n");
        printf("\tFull balance without filters requested. This operation is very\n");
is put after fork() in this patch when '--backgroud';

Best Regards
Wang Yugui (wangyugui@e16-tech.com)
2021/11/05

> This patch makes old balance command to print warning message same as
> in start command. It makes do_balance() checks flags that needs to
> print warning message. It works in old command because old command also
> uses do_balance().
> 
> Issue: #411
> 
> Signed-off-by: Sidong Yang <realwakka@gmail.com>
> ---
> v2:
>  - Prints warning message in do_balance()
> ---
>  cmds/balance.c | 36 ++++++++++++++++++------------------
>  1 file changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/cmds/balance.c b/cmds/balance.c
> index 7abc69d9..2e903b5c 100644
> --- a/cmds/balance.c
> +++ b/cmds/balance.c
> @@ -322,6 +322,24 @@ static int do_balance(const char *path, struct btrfs_ioctl_balance_args *args,
>  		return 1;
>  	}
>  
> +	if (!(flags & BALANCE_START_FILTERS) && !(flags & BALANCE_START_NOWARN)) {
> +		int delay = 10;
> +
> +		printf("WARNING:\n\n");
> +		printf("\tFull balance without filters requested. This operation is very\n");
> +		printf("\tintense and takes potentially very long. It is recommended to\n");
> +		printf("\tuse the balance filters to narrow down the scope of balance.\n");
> +		printf("\tUse 'btrfs balance start --full-balance' option to skip this\n");
> +		printf("\twarning. The operation will start in %d seconds.\n", delay);
> +		printf("\tUse Ctrl-C to stop it.\n");
> +		while (delay) {
> +			printf("%2d", delay--);
> +			fflush(stdout);
> +			sleep(1);
> +		}
> +		printf("\nStarting balance without any filters.\n");
> +	}
> +
>  	ret = ioctl(fd, BTRFS_IOC_BALANCE_V2, args);
>  	if (ret < 0) {
>  		/*
> @@ -547,24 +565,6 @@ static int cmd_balance_start(const struct cmd_struct *cmd,
>  		printf("\nStarting conversion to RAID5/6.\n");
>  	}
>  
> -	if (!(start_flags & BALANCE_START_FILTERS) && !(start_flags & BALANCE_START_NOWARN)) {
> -		int delay = 10;
> -
> -		printf("WARNING:\n\n");
> -		printf("\tFull balance without filters requested. This operation is very\n");
> -		printf("\tintense and takes potentially very long. It is recommended to\n");
> -		printf("\tuse the balance filters to narrow down the scope of balance.\n");
> -		printf("\tUse 'btrfs balance start --full-balance' option to skip this\n");
> -		printf("\twarning. The operation will start in %d seconds.\n", delay);
> -		printf("\tUse Ctrl-C to stop it.\n");
> -		while (delay) {
> -			printf("%2d", delay--);
> -			fflush(stdout);
> -			sleep(1);
> -		}
> -		printf("\nStarting balance without any filters.\n");
> -	}
> -
>  	if (force)
>  		args.flags |= BTRFS_BALANCE_FORCE;
>  	if (bconf.verbose > BTRFS_BCONF_QUIET)
> -- 
> 2.25.1

Re: [PATCH v2] btrfs-progs: balance: print warn mesg in old command

[David Sterba]

On Fri, Nov 05, 2021 at 04:05:41PM +0800, Wang Yugui wrote:
> Hi,
> 
> This patch broken tests/cli-tests/002-balance-full-no-filters.
> 
> becasue this
> 	printf("WARNING:\n\n");
>         printf("\tFull balance without filters requested. This operation is very\n");
> is put after fork() in this patch when '--backgroud';

Right, I ran all the other tests than test-cli. I'll remove the patch
from 5.15 queue.

Re: [PATCH v2] btrfs-progs: balance: print warn mesg in old command

[Sidong Yang]

On Fri, Nov 05, 2021 at 12:50:36PM +0100, David Sterba wrote:
> On Fri, Nov 05, 2021 at 04:05:41PM +0800, Wang Yugui wrote:
> > Hi,
> > 
> > This patch broken tests/cli-tests/002-balance-full-no-filters.
> > 
> > becasue this
> > 	printf("WARNING:\n\n");
> >         printf("\tFull balance without filters requested. This operation is very\n");
> > is put after fork() in this patch when '--backgroud';

Thanks, This patch has an issue. I should work on it.
> 
> Right, I ran all the other tests than test-cli. I'll remove the patch
> from 5.15 queue.