From deaf3172c99db9e4c9ab75d657c598f732610276 Mon Sep 17 00:00:00 2001 From: Lai Siyao Date: Fri, 17 May 2024 05:40:23 -0400 Subject: [PATCH] LU-17897 lfsck: don't assert on orphan existence lfsck_namespace_create_orphan_dir() is called in several cases, and orphan may exist in some cases, change assertion to check. Lustre-change: https://review.whamcloud.com/55302 Lustre-commit: 192c395d01062f2e1178ec8ce437f5eea42011c1 Signed-off-by: Lai Siyao Change-Id: I28563aa60d0f345616fd30cd0899495e7c1ef8f0 Reviewed-by: Andreas Dilger Reviewed-by: Hongchao Zhang Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/55506 Tested-by: jenkins Tested-by: Maloo --- lustre/lfsck/lfsck_namespace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/lfsck/lfsck_namespace.c b/lustre/lfsck/lfsck_namespace.c index d3dedc0..2cf8647 100644 --- a/lustre/lfsck/lfsck_namespace.c +++ b/lustre/lfsck/lfsck_namespace.c @@ -1463,7 +1463,8 @@ static int lfsck_namespace_create_orphan_dir(const struct lu_env *env, int rc1 = 0; ENTRY; - LASSERT(!dt_object_exists(orphan)); + if (dt_object_exists(orphan)) + RETURN(0); cname->ln_name = NULL; if (lfsck->li_bookmark_ram.lb_param & LPF_DRYRUN) -- 1.8.3.1