ocfs2: give an obvious tip for mismatched cluster names
PATCH 2/11 ocfs2: give an obvious tip for mismatched cluster names
From: Gang He <[email protected]>
Subject: ocfs2: give an obvious tip for mismatched cluster names
Add an obvious error message, due to mismatched cluster names between on-disk and in the current cluster. We can meet this case during OCFS2 cluster migration.
If we can give the user an obvious tip for why they can not mount the file system after migration, they can quickly fix this mismatch problem.
Second, also move printing ocfs2_fill_super() errno to the front of ocfs2_dismount_volume(), since ocfs2_dismount_volume() will also print its own message.
I looked through all the code of OCFS2 (include o2cb); there is not any place which returns this error. In fact, the function calling path ocfs2_fill_super -> ocfs2_mount_volume -> ocfs2_dlm_init -> dlm_new_lockspace is a very specific one. We can use this errno to give the user a more clear tip, since this case is a little common during cluster migration, but the customer can quickly get the failure cause if there is a error printed. Also, I think it is not possible to add this errno in the o2cb path during ocfs2_dlm_init(), since the o2cb code has been stable for a long time.
We only print this error tip when the user uses pcmk stack, since using the o2cb stack the user will not meet this error.
---
fs/ocfs2/super.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/ocfs2/super.c renamed from fs/ocfs2/super.c~ocfs2-give-an-obvious-tip-for-dismatch-cluster-names +6 -2
@@ -1208,14 +1208,15 @@ static int ocfs2_fill_super(struct super read_super_error:brelse (bh); +if (status) +mlog_errno (status); +if (osb) {atomic_set (&osb->vol_state,VOLUME_DISABLED );wake_up (&osb->osb_mount_event);ocfs2_dismount_volume (sb,1 ); } -if (status) -mlog_errno (status);return status; }
@@ -1843,6 +1844,9 @@ static int ocfs2_mount_volume(struct sup status =ocfs2_dlm_init (osb);if (status <0 ) {mlog_errno (status); +if (status == -EBADR &&ocfs2_userspace_stack (osb)) +mlog (ML_ERROR ,"couldn't mount because cluster name on" +" disk does not match the running cluster name.\n" ); goto leave; }
_
PATCH 2/11 ocfs2: give an obvious tip for mismatched cluster names
Quoted 74 lines · akpm at linux-foundation.org
From: Gang He <[email protected]>
Subject: ocfs2: give an obvious tip for mismatched cluster namesAdd an obvious error message, due to mismatched cluster names between on-disk and in the current cluster. We can meet this case during OCFS2 cluster migration.
If we can give the user an obvious tip for why they can not mount the file system after migration, they can quickly fix this mismatch problem.
Second, also move printing
ocfs2_fill_super()errno to the front ofocfs2_dismount_volume(), sinceocfs2_dismount_volume()will also print its own message.I looked through all the code of OCFS2 (include o2cb); there is not any place which returns this error. In fact, the function calling path
ocfs2_fill_super->ocfs2_mount_volume->ocfs2_dlm_init->dlm_new_lockspaceis a very specific one. We can use this errno to give the user a more clear tip, since this case is a little common during cluster migration, but the customer can quickly get the failure cause if there is a error printed. Also, I think it is not possible to add this errno in the o2cb path duringocfs2_dlm_init(), since the o2cb code has been stable for a long time.We only print this error tip when the user uses pcmk stack, since using the o2cb stack the user will not meet this error.
[ghe at suse.com: v2]Signed-off-by Gang He <[email protected]>Reviewed-by Mark Fasheh <[email protected]>Cc Joel Becker <[email protected]>Cc Junxiao Bi <[email protected]>Cc Joseph Qi <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
fs/ocfs2/super.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)diff -puN
fs/ocfs2/super.c~ocfs2-give-an-obvious-tip-for-dismatch-cluster-namesfs/ocfs2/super.cfs/ocfs2/super.c renamed from fs/ocfs2/super.c~ocfs2-give-an-obvious-tip-for-dismatch-cluster-names +6
-2@@ -1208,14 +1208,15 @@ static int ocfs2_fill_super(struct super read_super_error:brelse (bh); +if (status) +mlog_errno (status); +if (osb) {atomic_set (&osb->vol_state,VOLUME_DISABLED );wake_up (&osb->osb_mount_event);ocfs2_dismount_volume (sb,1 ); } -if (status) -mlog_errno (status);return status; }@@ -1843,6 +1844,9 @@ static int ocfs2_mount_volume(struct sup status =ocfs2_dlm_init (osb);if (status <0 ) {mlog_errno (status); +if (status == -EBADR &&ocfs2_userspace_stack (osb)) +mlog (ML_ERROR ,"couldn't mount because cluster name on" +" disk does not match the running cluster name.\n" ); goto leave; }_
PATCH 2/11 ocfs2: give an obvious tip for mismatched cluster names
In reply to akpm at linux-foundation.orgQuoted 81 lines · akpm at linux-foundation.org
From: Gang He <[email protected]>
Subject: ocfs2: give an obvious tip for mismatched cluster namesAdd an obvious error message, due to mismatched cluster names between on-disk and in the current cluster. We can meet this case during OCFS2 cluster migration.
If we can give the user an obvious tip for why they can not mount the file system after migration, they can quickly fix this mismatch problem.
Second, also move printing
ocfs2_fill_super()errno to the front ofocfs2_dismount_volume(), sinceocfs2_dismount_volume()will also print its own message.I looked through all the code of OCFS2 (include o2cb); there is not any place which returns this error. In fact, the function calling path
ocfs2_fill_super->ocfs2_mount_volume->ocfs2_dlm_init->dlm_new_lockspaceis a very specific one. We can use this errno to give the user a more clear tip, since this case is a little common during cluster migration, but the customer can quickly get the failure cause if there is a error printed. Also, I think it is not possible to add this errno in the o2cb path duringocfs2_dlm_init(), since the o2cb code has been stable for a long time.We only print this error tip when the user uses pcmk stack, since using the o2cb stack the user will not meet this error.
[ghe at suse.com: v2]Signed-off-by Gang He <[email protected]>Reviewed-by Mark Fasheh <[email protected]>Cc Joel Becker <[email protected]>Cc Junxiao Bi <[email protected]>Cc Joseph Qi <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
fs/ocfs2/super.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)diff -puN
fs/ocfs2/super.c~ocfs2-give-an-obvious-tip-for-dismatch-cluster-namesfs/ocfs2/super.cfs/ocfs2/super.c renamed from fs/ocfs2/super.c~ocfs2-give-an-obvious-tip-for-dismatch-cluster-names +6
-2@@ -1208,14 +1208,15 @@ static int ocfs2_fill_super(struct super read_super_error:brelse (bh); +if (status) +mlog_errno (status); +if (osb) {atomic_set (&osb->vol_state,VOLUME_DISABLED );wake_up (&osb->osb_mount_event);ocfs2_dismount_volume (sb,1 ); } -if (status) -mlog_errno (status);return status; }@@ -1843,6 +1844,9 @@ static int ocfs2_mount_volume(struct sup status =ocfs2_dlm_init (osb);if (status <0 ) {mlog_errno (status); +if (status == -EBADR &&ocfs2_userspace_stack (osb)) +mlog (ML_ERROR ,"couldn't mount because cluster name on" +" disk does not match the running cluster name.\n" ); goto leave; }_
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel at oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel.