[v2] btrfs: log, when replace, is canceled by the user
diff mbox

Message ID 20180213035343.18128-1-anand.jain@oracle.com
State New
Headers show

Commit Message

Anand Jain Feb. 13, 2018, 3:53 a.m. UTC
For forensic investigations of issues, we would want to know
if and when the user cancels the replace.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v1->v2: use btrfs_dev_name() instead of rcu_str_deref()
        as btrfs_dev_name() also provides "missing" string,
        if needed.

 fs/btrfs/dev-replace.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Qu Wenruo Feb. 13, 2018, 9:05 a.m. UTC | #1
On 2018年02月13日 11:53, Anand Jain wrote:
> For forensic investigations of issues, we would want to know
> if and when the user cancels the replace.
> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>> ---
> v1->v2: use btrfs_dev_name() instead of rcu_str_deref()
>         as btrfs_dev_name() also provides "missing" string,
>         if needed.

Would you please provide the branch you're using?

As I couldn't find the function or macro of btrfs_dev_name()

Thanks,
Qu

> 
>  fs/btrfs/dev-replace.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
> index dd717e204b5e..3b0760f7ec8a 100644
> --- a/fs/btrfs/dev-replace.c
> +++ b/fs/btrfs/dev-replace.c
> @@ -703,6 +703,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
>  {
>  	struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
>  	struct btrfs_device *tgt_device = NULL;
> +	struct btrfs_device *src_device = NULL;
>  	struct btrfs_trans_handle *trans;
>  	struct btrfs_root *root = fs_info->tree_root;
>  	int result;
> @@ -724,6 +725,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
>  	case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:
>  		result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;
>  		tgt_device = dev_replace->tgtdev;
> +		src_device = dev_replace->srcdev;
>  		dev_replace->tgtdev = NULL;
>  		dev_replace->srcdev = NULL;
>  		break;
> @@ -741,6 +743,11 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
>  	}
>  	ret = btrfs_commit_transaction(trans);
>  	WARN_ON(ret);
> +
> +	btrfs_info(fs_info, "dev_replace from %s (devid %llu) to %s canceled",
> +		   btrfs_dev_name(src_device), src_device->devid,
> +		   btrfs_dev_name(tgt_device));
> +
>  	if (tgt_device)
>  		btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);
>  
>
Nikolay Borisov Feb. 13, 2018, 9:08 a.m. UTC | #2
On 13.02.2018 11:05, Qu Wenruo wrote:
> 
> 
> On 2018年02月13日 11:53, Anand Jain wrote:
>> For forensic investigations of issues, we would want to know
>> if and when the user cancels the replace.
>>
>> Signed-off-by: Anand Jain <anand.jain@oracle.com>> ---
>> v1->v2: use btrfs_dev_name() instead of rcu_str_deref()
>>         as btrfs_dev_name() also provides "missing" string,
>>         if needed.
> 
> Would you please provide the branch you're using?
> 
> As I couldn't find the function or macro of btrfs_dev_name()


I have it in my misc-next checkout. I got introduced by
3c958bd23b60 ("btrfs: add helper for device path or missing")

which is in 4.16-rc1 so pretty recent.


> 
> Thanks,
> Qu
> 
>>
>>  fs/btrfs/dev-replace.c | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
>> index dd717e204b5e..3b0760f7ec8a 100644
>> --- a/fs/btrfs/dev-replace.c
>> +++ b/fs/btrfs/dev-replace.c
>> @@ -703,6 +703,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
>>  {
>>  	struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
>>  	struct btrfs_device *tgt_device = NULL;
>> +	struct btrfs_device *src_device = NULL;
>>  	struct btrfs_trans_handle *trans;
>>  	struct btrfs_root *root = fs_info->tree_root;
>>  	int result;
>> @@ -724,6 +725,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
>>  	case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:
>>  		result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;
>>  		tgt_device = dev_replace->tgtdev;
>> +		src_device = dev_replace->srcdev;
>>  		dev_replace->tgtdev = NULL;
>>  		dev_replace->srcdev = NULL;
>>  		break;
>> @@ -741,6 +743,11 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
>>  	}
>>  	ret = btrfs_commit_transaction(trans);
>>  	WARN_ON(ret);
>> +
>> +	btrfs_info(fs_info, "dev_replace from %s (devid %llu) to %s canceled",
>> +		   btrfs_dev_name(src_device), src_device->devid,
>> +		   btrfs_dev_name(tgt_device));
>> +
>>  	if (tgt_device)
>>  		btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);
>>  
>>
> 
--
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
Qu Wenruo Feb. 13, 2018, 9:10 a.m. UTC | #3
On 2018年02月13日 17:08, Nikolay Borisov wrote:
> 
> 
> On 13.02.2018 11:05, Qu Wenruo wrote:
>>
>>
>> On 2018年02月13日 11:53, Anand Jain wrote:
>>> For forensic investigations of issues, we would want to know
>>> if and when the user cancels the replace.
>>>
>>> Signed-off-by: Anand Jain <anand.jain@oracle.com>> ---
>>> v1->v2: use btrfs_dev_name() instead of rcu_str_deref()
>>>         as btrfs_dev_name() also provides "missing" string,
>>>         if needed.
>>
>> Would you please provide the branch you're using?
>>
>> As I couldn't find the function or macro of btrfs_dev_name()
> 
> 
> I have it in my misc-next checkout. I got introduced by
> 3c958bd23b60 ("btrfs: add helper for device path or missing")
> 
> which is in 4.16-rc1 so pretty recent.

I was on v4.15, no wonder no such function.

Thank you very much,
Qu

> 
> 
>>
>> Thanks,
>> Qu
>>
>>>
>>>  fs/btrfs/dev-replace.c | 7 +++++++
>>>  1 file changed, 7 insertions(+)
>>>
>>> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
>>> index dd717e204b5e..3b0760f7ec8a 100644
>>> --- a/fs/btrfs/dev-replace.c
>>> +++ b/fs/btrfs/dev-replace.c
>>> @@ -703,6 +703,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
>>>  {
>>>  	struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
>>>  	struct btrfs_device *tgt_device = NULL;
>>> +	struct btrfs_device *src_device = NULL;
>>>  	struct btrfs_trans_handle *trans;
>>>  	struct btrfs_root *root = fs_info->tree_root;
>>>  	int result;
>>> @@ -724,6 +725,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
>>>  	case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:
>>>  		result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;
>>>  		tgt_device = dev_replace->tgtdev;
>>> +		src_device = dev_replace->srcdev;
>>>  		dev_replace->tgtdev = NULL;
>>>  		dev_replace->srcdev = NULL;
>>>  		break;
>>> @@ -741,6 +743,11 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
>>>  	}
>>>  	ret = btrfs_commit_transaction(trans);
>>>  	WARN_ON(ret);
>>> +
>>> +	btrfs_info(fs_info, "dev_replace from %s (devid %llu) to %s canceled",
>>> +		   btrfs_dev_name(src_device), src_device->devid,
>>> +		   btrfs_dev_name(tgt_device));
>>> +
>>>  	if (tgt_device)
>>>  		btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);
>>>  
>>>
>>
> --
> 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
>
David Sterba Feb. 13, 2018, 5:04 p.m. UTC | #4
On Tue, Feb 13, 2018 at 11:53:43AM +0800, Anand Jain wrote:
> For forensic investigations of issues, we would want to know
> if and when the user cancels the replace.
> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>

Reviewed-by: David Sterba <dsterba@suse.com>

I've updated the changelog a bit.
--
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

Patch
diff mbox

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index dd717e204b5e..3b0760f7ec8a 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -703,6 +703,7 @@  int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
 {
 	struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
 	struct btrfs_device *tgt_device = NULL;
+	struct btrfs_device *src_device = NULL;
 	struct btrfs_trans_handle *trans;
 	struct btrfs_root *root = fs_info->tree_root;
 	int result;
@@ -724,6 +725,7 @@  int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
 	case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:
 		result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;
 		tgt_device = dev_replace->tgtdev;
+		src_device = dev_replace->srcdev;
 		dev_replace->tgtdev = NULL;
 		dev_replace->srcdev = NULL;
 		break;
@@ -741,6 +743,11 @@  int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)
 	}
 	ret = btrfs_commit_transaction(trans);
 	WARN_ON(ret);
+
+	btrfs_info(fs_info, "dev_replace from %s (devid %llu) to %s canceled",
+		   btrfs_dev_name(src_device), src_device->devid,
+		   btrfs_dev_name(tgt_device));
+
 	if (tgt_device)
 		btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);