[PATCH v4] mdadm/r5cache: allow adding journal to array without journal

[PATCH v4] mdadm/r5cache: allow adding journal to array without journal

[Song Liu]

Currently, --add-journal can be only used to recreate broken journal
for arrays with journal since  creation. As the kernel code getting
more mature, this constraint is no longer necessary.

This patch allows --add-journal to add journal to array without
journal.

Signed-off-by: Song Liu <songliubraving@fb.com>
---
 Manage.c   | 6 ------
 mdadm.8.in | 5 ++---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Manage.c b/Manage.c
index 5c3d2b9..5ff5de3 100644
--- a/Manage.c
+++ b/Manage.c
@@ -946,7 +946,6 @@ int Manage_add(int fd, int tfd, struct mddev_dev *dv,
 
 	/* only add journal to array that supports journaling */
 	if (dv->disposition == 'j') {
-		struct mdinfo mdi;
 		struct mdinfo *mdp;
 
 		mdp = sysfs_read(fd, NULL, GET_ARRAY_STATE);
@@ -963,11 +962,6 @@ int Manage_add(int fd, int tfd, struct mddev_dev *dv,
 
 		sysfs_free(mdp);
 
-		tst->ss->getinfo_super(tst, &mdi, NULL);
-		if (mdi.journal_device_required == 0) {
-			pr_err("%s does not support journal device.\n", devname);
-			return -1;
-		}
 		disc.raid_disk = 0;
 	}
 
diff --git a/mdadm.8.in b/mdadm.8.in
index df1d460..9e5e896 100644
--- a/mdadm.8.in
+++ b/mdadm.8.in
@@ -1474,9 +1474,8 @@ the device is found or <slot>:missing in case the device is not found.
 
 .TP
 .BR \-\-add-journal
-Recreate journal for RAID-4/5/6 array that lost a journal device. In the
-current implementation, this command cannot add a journal to an array
-that had a failed journal. To avoid interrupting on-going write opertions,
+Add journal to an existing array, or recreate journal for RAID-4/5/6 array
+that lost a journal device. To avoid interrupting on-going write opertions,
 .B \-\-add-journal
 only works for array in Read-Only state.
 
-- 
2.9.3

Re: [PATCH v4] mdadm/r5cache: allow adding journal to array without journal

[jes.sorensen]

Song Liu <songliubraving@fb.com> writes:
> Currently, --add-journal can be only used to recreate broken journal
> for arrays with journal since  creation. As the kernel code getting
> more mature, this constraint is no longer necessary.
>
> This patch allows --add-journal to add journal to array without
> journal.
>
> Signed-off-by: Song Liu <songliubraving@fb.com>
> ---
>  Manage.c   | 6 ------
>  mdadm.8.in | 5 ++---
>  2 files changed, 2 insertions(+), 9 deletions(-)

Applied!

Thanks,
Jes

Re: [PATCH v4] mdadm/r5cache: allow adding journal to array without journal

[Jes Sorensen]

On 03/28/2017 02:15 PM, jes.sorensen@gmail.com wrote:
> Song Liu <songliubraving@fb.com> writes:
>> Currently, --add-journal can be only used to recreate broken journal
>> for arrays with journal since  creation. As the kernel code getting
>> more mature, this constraint is no longer necessary.
>>
>> This patch allows --add-journal to add journal to array without
>> journal.
>>
>> Signed-off-by: Song Liu <songliubraving@fb.com>
>> ---
>>   Manage.c   | 6 ------
>>   mdadm.8.in | 5 ++---
>>   2 files changed, 2 insertions(+), 9 deletions(-)
> 
> Applied!

It was pointed out to me that this patch never showed up in git.

After digging through my git tree a bit, I see no sign of having applied 
it :( Well it's in there now, apologies.

Kudos to Christian Schmidt for pointing this out.

Cheers,
Jes