From: Fan Yong Date: Mon, 23 Jun 2014 22:01:52 +0000 (+0800) Subject: LU-4970 lfsck: flush async updating before exit X-Git-Tag: 2.6.52~40 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6390fd204a1ae978bbd786a294c31af7d49319b9;ds=sidebyside LU-4970 lfsck: flush async updating before exit Otherwise, the test scripts may get some internal status by race. Signed-off-by: Fan Yong Change-Id: I4af07cf91f6b6c77d5cab67fc0df21b27174ee4c Reviewed-on: http://review.whamcloud.com/11276 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Nathaniel Clark Reviewed-by: Andreas Dilger Tested-by: Andreas Dilger --- diff --git a/lustre/lfsck/lfsck_layout.c b/lustre/lfsck/lfsck_layout.c index ba861c0..87acec9 100644 --- a/lustre/lfsck/lfsck_layout.c +++ b/lustre/lfsck/lfsck_layout.c @@ -3807,6 +3807,9 @@ cleanup2: rc = rc1; } + /* flush all async updating before exit. */ + dt_sync(env, lfsck->li_next); + /* Under force exit case, some requests may be just freed without * verification, those objects should be re-handled when next run. * So not update the on-disk tracing file under such case. */ diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh index 34ee6ed..18c6bbb 100644 --- a/lustre/tests/sanity-lfsck.sh +++ b/lustre/tests/sanity-lfsck.sh @@ -43,10 +43,6 @@ setupall [[ $(lustre_version_code ost1) -lt $(version_code 2.5.55) ]] && ALWAYS_EXCEPT="$ALWAYS_EXCEPT 11 12 13 14 15 16 17 18 19 20 21" -[ $(facet_fstype $SINGLEMDS) = "zfs" ] && -# bug number for skipped test: LU-4970 - ALWAYS_EXCEPT="$ALWAYS_EXCEPT 14" - build_test_filter $LCTL set_param debug=+lfsck > /dev/null || true