X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-pcc.sh;h=16515b60df8c192061de37b12ef5d97c3946eddd;hb=refs%2Fchanges%2F92%2F36892%2F13;hp=32c4ec62a7b38e240078733367a25053ab8cda83;hpb=2102c86e0d0ae735aed9ee8c1c6a77b63eda6037;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-pcc.sh b/lustre/tests/sanity-pcc.sh
index 32c4ec6..16515b6 100644
--- a/lustre/tests/sanity-pcc.sh
+++ b/lustre/tests/sanity-pcc.sh
@@ -36,8 +36,8 @@ FAIL_ON_ERROR=false
 
 check_and_setup_lustre
 
-if [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.12.52) ]]; then
-	skip_env "Need MDS version at least 2.12.52" && exit
+if [[ "$MDS1_VERSION" -lt $(version_code 2.12.52) ]]; then
+	skip "Need MDS version at least 2.12.52"
 fi
 
 # $RUNAS_ID may get set incorrectly somewhere else
@@ -135,7 +135,8 @@ check_lpcc_state()
 	local lustre_path="$1"
 	local expected_state="$2"
 	local facet=${3:-$SINGLEAGT}
-	local state=$(do_facet $facet $LFS pcc state $lustre_path |
+	local myRUNAS="$4"
+	local state=$(do_facet $facet $myRUNAS $LFS pcc state $lustre_path |
 			awk -F 'type: ' '{print $2}' | awk -F ',' '{print $1}')
 
 	[[ "x$state" == "x$expected_state" ]] || error \
@@ -175,17 +176,37 @@ setup_pcc_mapping() {
 	local hsm_root=${hsm_root:-$(hsm_root "$facet")}
 	local param="$2"
 
-	[ -z "$param" ] && param="$HSM_ARCHIVE_NUMBER\ 100"
+	[ -z "$param" ] && param="projid={100}\ rwid=$HSM_ARCHIVE_NUMBER"
 	stack_trap "cleanup_pcc_mapping $facet" EXIT
 	do_facet $facet $LCTL pcc add $MOUNT $hsm_root -p $param
 }
 
+setup_loopdev() {
+	local facet=$1
+	local file=$2
+	local mntpt=$3
+	local size=${4:-50}
+
+	do_facet $facet mkdir -p $mntpt || error "mkdir -p $hsm_root failed"
+	stack_trap "do_facet $facet rm -rf $mntpt" EXIT
+	do_facet $facet dd if=/dev/zero of=$file bs=1M count=$size
+	stack_trap "do_facet $facet rm -f $file" EXIT
+	do_facet $facet mkfs.ext4 $file ||
+		error "mkfs.ext4 $file failed"
+	do_facet $facet file $file
+	do_facet $facet mount -t ext4 -o loop,usrquota,grpquota $file $mntpt ||
+		error "mount -o loop,usrquota,grpquota $file $mntpt failed"
+	stack_trap "do_facet $facet $UMOUNT $mntpt" EXIT
+}
+
 lpcc_rw_test() {
 	local restore="$1"
 	local project="$2"
 	local project_id=100
 	local agt_facet=$SINGLEAGT
-	local hsm_root=$(hsm_root)
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
 	local file=$DIR/$tdir/$tfile
 	local -a state
 	local -a lpcc_path
@@ -194,6 +215,7 @@ lpcc_rw_test() {
 	$project && enable_project_quota
 
 	do_facet $SINGLEAGT rm -rf $hsm_root
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 
 	is_project_quota_supported || project=false
@@ -230,6 +252,7 @@ lpcc_rw_test() {
 	check_hsm_flags $file "0x0000000d"
 	check_lpcc_data $SINGLEAGT $lpcc_path $file "file_data"
 
+	echo "Restore testing..."
 	if [ $CLIENTCOUNT -lt 2 -o $restore ]; then
 		$LFS hsm_restore $file || error \
 			"failed to restore $file"
@@ -266,9 +289,11 @@ lpcc_rw_test() {
 	echo "Start to detach the $file"
 	do_facet $SINGLEAGT $LFS pcc detach $file ||
 		error "PCC detach $file failed"
+	wait_request_state $(path2fid $file) REMOVE SUCCEED
+
 	check_lpcc_state $file "none"
-	# HSM released exists archived status
-	check_hsm_flags $file "0x0000000d"
+	# The file is removed from PCC
+	check_hsm_flags $file "0x00000000"
 	check_file_data $SINGLEAGT $file "attach_detach"
 }
 
@@ -298,7 +323,9 @@ test_1e() {
 	local -a lpcc_path
 
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
-	setup_pcc_mapping
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100}\ rwid=$HSM_ARCHIVE_NUMBER\ auto_attach=0"
+	$LCTL pcc list $MOUNT
 	mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed"
 	chmod 777 $DIR/$tdir || error "chmod 777 $DIR/$tdir failed"
 
@@ -317,6 +344,10 @@ test_1e() {
 		error "failed to dd write to $file"
 	check_lpcc_state $file "readwrite"
 
+	do_facet $SINGLEAGT $RUNAS $LFS pcc detach -k $file ||
+		error "failed to detach file $file"
+	check_lpcc_state $file "none"
+
 	# non-root user is forbidden to access PCC file directly
 	lpcc_path=$(lpcc_fid2path $hsm_root $file)
 	do_facet $SINGLEAGT $RUNAS touch $lpcc_path &&
@@ -330,24 +361,34 @@ test_1e() {
 
 	[[ $perm == "0" ]] || error "PCC file permission ($perm) is not zero"
 
+	do_facet $SINGLEAGT $RUNAS $LFS pcc attach -i $HSM_ARCHIVE_NUMBER \
+		$file || error "failed to attach file $file"
+	check_lpcc_state $file "readwrite"
+
 	do_facet $SINGLEAGT $RUNAS $LFS pcc detach $file ||
 		error "failed to detach file $file"
 	check_lpcc_state $file "none"
+	wait_request_state $(path2fid $file) REMOVE SUCCEED
 }
 run_test 1e "Test RW-PCC with non-root user"
 
 test_1f() {
 	local project_id=100
 	local agt_facet=$SINGLEAGT
-	local hsm_root=$(hsm_root)
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
 	local file=$DIR/$tdir/$tfile
 
 	! is_project_quota_supported &&
 		skip "project quota is not supported"
 
 	enable_project_quota
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
-	setup_pcc_mapping
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100}\ rwid=$HSM_ARCHIVE_NUMBER\ open_attach=0\ stat_attach=0"
+
 	do_facet $SINGLEAGT mkdir -p $DIR/$tdir
 	chmod 777 $DIR/$tdir || error "chmod 0777 $DIR/$tdir failed"
 	$LFS project -sp $project_id $DIR/$tdir ||
@@ -363,7 +404,7 @@ test_1f() {
 		error "failed to truncate $file"
 	do_facet $SINGLEAGT $RUNAS $TRUNCATE $file 2048 ||
 		error "failed to truncate $file"
-	do_facet $SINGLEAGT $RUNAS dd if=/dev/zero of=$file bs=1024 count=1 ||
+	do_facet $SINGLEAGT $RUNAS dd if=/dev/zero of=$file bs=256 count=1 ||
 		error "failed to dd write from $file"
 	check_lpcc_state $file "readwrite"
 
@@ -378,13 +419,18 @@ test_1f() {
 
 	do_facet $SINGLEAGT $RUNAS $LFS pcc detach $file ||
 		error "failed to detach file $file"
+	wait_request_state $(path2fid $file) REMOVE SUCCEED
 	check_lpcc_state $file "none"
 }
 run_test 1f "Test auto RW-PCC cache with non-root user"
 
 test_1g() {
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
 	local file=$DIR/$tfile
 
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
 
@@ -407,6 +453,7 @@ test_1g() {
 	do_facet $SINGLEAGT $RUNAS $LFS pcc detach $file ||
 		error "failed to detach file $file"
 	check_lpcc_state $file "none"
+	wait_request_state $(path2fid $file) REMOVE SUCCEED
 	do_facet $SINGLEAGT $RUNAS dd if=$file of=/dev/null bs=1024 count=1 ||
 		error "non-root user cannot read to $file with permisson (777)"
 }
@@ -419,13 +466,16 @@ run_test 1g "General permission test for RW-PCC"
 test_2a() {
 	local project_id=100
 	local agt_facet=$SINGLEAGT
-	local hsm_root=$(hsm_root)
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
 	local agt_host=$(facet_active_host $SINGLEAGT)
 
 	! is_project_quota_supported &&
 		skip "project quota is not supported" && return
 
 	enable_project_quota
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
 	file=$DIR/$tdir/multiop
@@ -447,6 +497,8 @@ test_2a() {
 	# HSM released exists archived status
 	check_hsm_flags $file "0x0000000d"
 
+	do_facet $SINGLEAGT $LFS pcc detach $file ||
+		error "failed to detach $file"
 	rmultiop_stop $agt_host || error "close $file failed"
 }
 run_test 2a "Test multi open when creating"
@@ -470,14 +522,17 @@ get_remote_client() {
 #
 test_2b() {
 	local agt_facet=$SINGLEAGT
-	local hsm_root=$(hsm_root)
 	local agt_host=$(facet_active_host $SINGLEAGT)
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
 
 	needclients 2 || return 0
 
 	remote_client=$(get_remote_client)
 
 	enable_project_quota
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
 	file=$DIR/$tdir/multiop
@@ -509,10 +564,14 @@ run_test 2b "Test multi remote open when creating"
 
 test_2c() {
 	local agt_host=$(facet_active_host $SINGLEAGT)
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
 	local file=$DIR/$tdir/$tfile
 	local file2=$DIR2/$tdir/$tfile
 
 	enable_project_quota
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
 	mkdir -p $DIR/$tdir
@@ -544,7 +603,8 @@ test_3a() {
 	local file=$DIR/$tdir/$tfile
 
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
-	setup_pcc_mapping
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100}\ rwid=$HSM_ARCHIVE_NUMBER\ auto_attach=0"
 
 	mkdir -p $DIR/$tdir || error "mkdir $DIR/$tdir failed"
 	dd if=/dev/zero of=$file bs=1024 count=1 ||
@@ -554,7 +614,7 @@ test_3a() {
 	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
 		error "failed to attach file $file"
 	check_lpcc_state $file "readwrite"
-	do_facet $SINGLEAGT $LFS pcc detach $file ||
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
 		error "failed to detach file $file"
 	check_lpcc_state $file "none"
 
@@ -562,7 +622,7 @@ test_3a() {
 	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
 		error "failed to attach file $file"
 	check_lpcc_state $file "readwrite"
-	do_facet $SINGLEAGT $LFS pcc detach $file ||
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
 		error "failed to detach file $file"
 	check_lpcc_state $file "none"
 }
@@ -577,7 +637,7 @@ test_3b() {
 	# Start all of the copytools and setup PCC
 	for n in $(seq $AGTCOUNT); do
 		copytool setup -f agt$n -a $n -m $MOUNT
-		setup_pcc_mapping agt$n "$n\ 100"
+		setup_pcc_mapping agt$n "projid={100}\ rwid=$n\ auto_attach=0"
 	done
 
 	mkdir -p $DIR/$tdir || error "mkdir $DIR/$tdir failed"
@@ -588,7 +648,7 @@ test_3b() {
 	do_facet agt1 $LFS pcc attach -i 1 $file ||
 		error "failed to attach file $file"
 	check_lpcc_state $file "readwrite" agt1
-	do_facet agt1 $LFS pcc detach $file ||
+	do_facet agt1 $LFS pcc detach -k $file ||
 		error "failed to detach file $file"
 	check_lpcc_state $file "none" agt1
 
@@ -596,7 +656,7 @@ test_3b() {
 	do_facet agt2 $LFS pcc attach -i 2 $file ||
 		error "failed to attach file $file"
 	check_lpcc_state $file "readwrite" agt2
-	do_facet agt2 $LFS pcc detach $file ||
+	do_facet agt2 $LFS pcc detach -k $file ||
 		error "failed to detach file $file"
 	check_lpcc_state $file "none" agt2
 
@@ -610,7 +670,7 @@ test_3b() {
 	# The later attach PCC agent should succeed,
 	# the former agent should be detached automatically.
 	check_lpcc_state $file "none" agt1
-	do_facet agt2 $LFS pcc detach $file ||
+	do_facet agt2 $LFS pcc detach -k $file ||
 		error "failed to detach file $file"
 	check_lpcc_state $file "none" agt2
 }
@@ -618,11 +678,15 @@ run_test 3b "Repeat attach/detach operations on multiple clients"
 
 test_4() {
 	local project_id=100
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
 
 	! is_project_quota_supported &&
 		skip "project quota is not supported" && return
 
 	enable_project_quota
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
 
@@ -636,16 +700,21 @@ test_4() {
 	$LUSTRE/tests/mmap_sanity -d $DIR/$tdir -m $DIR2/$tdir -e 7 ||
 		error "mmap_sanity test failed"
 	sync; sleep 1; sync
+
+	rm -rf $DIR/$tdir || error "failed to remove $DIR/$tdir"
 }
 run_test 4 "Auto cache test for mmap"
 
 test_5() {
-	local file=$DIR/$tdir/$tfile
+	local file=$DIR/$tfile
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
 
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
 
-	mkdir -p $DIR/$tdir || error "mkdir $DIR/$tdir failed"
 	do_facet $SINGLEAGT "echo -n attach_mmap_data > $file" ||
 		error "echo $file failed"
 
@@ -669,14 +738,16 @@ test_5() {
 run_test 5 "Mmap & cat a RW-PCC cached file"
 
 test_6() {
-	local file=$DIR/$tdir/$tfile
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tfile
 	local content
 
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
 
-	mkdir -p $DIR/$tdir || error "mkdir $DIR/$tdir failed"
-
 	echo -n mmap_write_data > $file || error "echo write $file failed"
 	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
 		error "failed to attach file $file"
@@ -694,6 +765,7 @@ test_6() {
 
 	do_facet $SINGLEAGT $LFS pcc detach $file ||
 		error "failed to detach file $file"
+	wait_request_state $(path2fid $file) REMOVE SUCCEED
 
 	content=$(do_facet $SINGLEAGT $MMAP_CAT $file)
 	[[ $content == "nmap_write_data" ]] ||
@@ -702,13 +774,16 @@ test_6() {
 run_test 6 "Test mmap write on RW-PCC "
 
 test_7a() {
-	local file=$DIR/$tdir/$tfile
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tfile
 	local content
 
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
 
-	mkdir -p $DIR/$tdir || error "mkdir $DIR/$tdir failed"
 	echo "QQQQQ" > $file
 	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
 		error "failed to attach file $file"
@@ -729,14 +804,18 @@ test_7a() {
 run_test 7a "Fake file detached between fault() and page_mkwrite() for RW-PCC"
 
 test_7b() {
-	local file=$DIR/$tdir/$tfile
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tfile
 	local content
 	local pid
 
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
-	setup_pcc_mapping
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100}\ rwid=$HSM_ARCHIVE_NUMBER\ auto_attach=0"
 
-	mkdir -p $DIR/$tdir || error "mkdir $DIR/$tdir failed"
 	echo "QQQQQ" > $file
 	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
 		error "failed to attach file $file"
@@ -747,11 +826,12 @@ test_7b() {
 	# HSM released exists archived status
 	check_hsm_flags $file "0x0000000d"
 
-	# multiop mmap write increase the first character of each page with 1
+	# multiop mmap write increases the first character of each page with 1
 	do_facet $SINGLEAGT $MULTIOP $file OSMWUc &
 	pid=$!
 
-	do_facet $SINGLEAGT $LFS pcc detach $file ||
+	sleep 3
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
 		error "failed to detach file $file"
 
 	wait $pid || error "multiop mmap write failed"
@@ -762,13 +842,15 @@ test_7b() {
 run_test 7b "Test the race with concurrent mkwrite and detach"
 
 test_8() {
-	local file=$DIR/$tdir/$tfile
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tfile
 
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
 
-	mkdir -p $DIR/$tdir || error "mkdir $DIR/$tdir failed"
-
 	echo "QQQQQ" > $file
 	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
 		error "failed to attach file $file"
@@ -785,24 +867,6 @@ test_8() {
 }
 run_test 8 "Test fake -ENOSPC tolerance for RW-PCC"
 
-setup_loopdev() {
-	local facet=$1
-	local file=$2
-	local mntpt=$3
-	local size=${4:-50}
-
-	do_facet $facet mkdir -p $mntpt || error "mkdir -p $hsm_root failed"
-	stack_trap "do_facet $facet rm -rf $mntpt" EXIT
-	do_facet $facet dd if=/dev/zero of=$file bs=1M count=$size
-	stack_trap "do_facet $facet rm -f $file" EXIT
-	do_facet $facet mkfs.ext4 $file ||
-		error "mkfs.ext4 $file failed"
-	do_facet $facet file $file
-	do_facet $facet mount -t ext4 -o loop,usrquota,grpquota $file $mntpt ||
-		error "mount -o loop,usrquota,grpquota $file $mntpt failed"
-	stack_trap "do_facet $facet $UMOUNT $mntpt" EXIT
-}
-
 test_9() {
 	local loopfile="$TMP/$tfile"
 	local mntpt="/mnt/pcc.9a"
@@ -873,7 +937,7 @@ test_usrgrp_quota() {
 		error "dd write $file1 failed"
 	# -EDQUOT error should be tolerated via fallback to normal Lustre path.
 	check_lpcc_state $file1 "none"
-	do_facet $SINGLEAGT $LFS pcc detach $file1 ||
+	do_facet $SINGLEAGT $LFS pcc detach -k $file1 ||
 		error "failed to detach file $file"
 	rm $file1 $file2
 }
@@ -889,16 +953,17 @@ test_10b() {
 run_test 10b "Test RW-PCC with group quota on loop PCC device"
 
 test_11() {
-	local file=$DIR/$tdir/$tfile
-	local hsm_root=$(hsm_root)
-	local file=$DIR/$tdir/$tfile
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tfile
 	local -a lpcc_path
 	local lpcc_dir
 
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
 
-	mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed"
 	do_facet $SINGLEAGT "echo -n QQQQQ > $file"
 	lpcc_path=$(lpcc_fid2path $hsm_root $file)
 	lpcc_dir=$(dirname $lpcc_path)
@@ -909,7 +974,7 @@ test_11() {
 		error "failed to attach $file"
 	check_lpcc_state $file "readwrite"
 	check_file_data $SINGLEAGT $file "QQQQQ"
-	do_facet $SINGLEAGT $LFS pcc detach $file ||
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
 		error "failed to detach $file"
 	rm $file || error "rm $file failed"
 
@@ -941,15 +1006,20 @@ run_test 11 "Test attach fault injection with simulated PCC file path"
 
 test_12() {
 	local file=$DIR/$tfile
+	local hsm_root=$(hsm_root)
+	local -a lpcc_path
 	local pid
 
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
-	setup_pcc_mapping
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100}\ rwid=$HSM_ARCHIVE_NUMBER\ auto_attach=0"
 
 	echo  -n race_rw_attach_hsmremove > $file
+	lpcc_path=$(lpcc_fid2path $hsm_root $file)
 	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
 		error "attach $file failed"
-	do_facet $SINGLEAGT $LFS pcc detach $file || error "detach $file failed"
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
+		error "detach $file failed"
 	# HSM released exists archived status
 	check_hsm_flags $file "0x0000000d"
 	# define OBD_FAIL_LLITE_PCC_ATTACH_PAUSE	0x1414
@@ -961,11 +1031,443 @@ test_12() {
 	wait_request_state $(path2fid $file) RESTORE SUCCEED
 	$LFS hsm_remove $file || error "hsm remove $file failed"
 	wait $pid && error "RW-PCC attach $file should fail"
+	do_facet $SINGLEAGT "[ -f $lpcc_path ]"	&&
+		error "RW-PCC cached file '$lpcc_path' should be removed"
 
 	return 0
 }
 run_test 12 "RW-PCC attach races with concurrent HSM remove"
 
+test_rule_id() {
+	local idstr="${1}id"
+	local rule="${idstr}={$2}"
+	local myRUNAS="$3"
+	local file=$DIR/$tdir/$tfile
+
+	setup_pcc_mapping $SINGLEAGT \
+		"$rule\ rwid=$HSM_ARCHIVE_NUMBER\ auto_attach=0"
+	$LCTL pcc list $MOUNT
+
+	do_facet $SINGLEAGT mkdir -p $DIR/$tdir
+	chmod 777 $DIR/$tdir || error "chmod 0777 $DIR/$tdir failed"
+
+	rm -f $file || error "rm $file failed"
+	do_facet $SINGLEAGT $myRUNAS dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	check_lpcc_state $file "readwrite"
+	do_facet $SINGLEAGT $myRUNAS dd if=$file of=/dev/null bs=1024 count=1 ||
+		error "failed to dd read from $file"
+	do_facet $SINGLEAGT $myRUNAS $TRUNCATE $file 256 ||
+		error "failed to truncate $file"
+	do_facet $SINGLEAGT $myRUNAS $TRUNCATE $file 2048 ||
+		error "failed to truncate $file"
+	do_facet $SINGLEAGT $myRUNAS dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write from $file"
+	check_lpcc_state $file "readwrite"
+
+	do_facet $SINGLEAGT $myRUNAS $LFS pcc detach $file ||
+		error "failed to detach file $file"
+	wait_request_state $(path2fid $file) REMOVE SUCCEED
+	check_lpcc_state $file "none"
+
+	cleanup_pcc_mapping
+}
+
+test_13a() {
+	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
+	test_rule_id "u" "500" "runas -u 500"
+	test_rule_id "g" "500" "runas -u 500 -g 500"
+}
+run_test 13a "Test auto RW-PCC create caching for UID/GID rule"
+
+test_13b() {
+	local file
+
+	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
+	setup_pcc_mapping $SINGLEAGT \
+		"fname={*.h5\ suffix.*\ Mid*dle}\ rwid=$HSM_ARCHIVE_NUMBER\ auto_attach=0"
+	$LCTL pcc list $MOUNT
+
+	do_facet $SINGLEAGT mkdir -p $DIR/$tdir
+	chmod 777 $DIR/$tdir || error "chmod 0777 $DIR/$tdir failed"
+
+	file=$DIR/$tdir/prefix.h5
+	do_facet $SINGLEAGT dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	check_lpcc_state $file "readwrite"
+	do_facet $SINGLEAGT $myRUNAS $LFS pcc detach -k $file ||
+		error "failed to detach file $file"
+	check_lpcc_state $file "none"
+	rm $file || error "rm $file failed"
+
+	file=$DIR/$tdir/suffix.doc
+	do_facet $SINGLEAGT $RUNAS dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	check_lpcc_state $file "readwrite"
+	do_facet $SINGLEAGT $myRUNAS $LFS pcc detach -k $file ||
+		error "failed to detach file $file"
+	check_lpcc_state $file "none"
+	rm $file || error "rm $file failed"
+
+	file=$DIR/$tdir/MidPADdle
+	do_facet $SINGLEAGT $RUNAS dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	check_lpcc_state $file "readwrite"
+	do_facet $SINGLEAGT $myRUNAS $LFS pcc detach -k $file ||
+		error "failed to detach file $file"
+	check_lpcc_state $file "none"
+	rm $file || error "rm $file failed"
+
+	file=$DIR/$tdir/Midpad
+	do_facet $SINGLEAGT $RUNAS dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	check_lpcc_state $file "none"
+	rm $file || error "rm $file failed"
+}
+run_test 13b "Test auto RW-PCC create caching for file name with wildcard"
+
+test_13c() {
+	local file
+	local myRUNAS
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+
+	! is_project_quota_supported &&
+		echo "Skip project quota is not supported" && return 0
+
+	enable_project_quota
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
+	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100\ 200}\&fname={*.h5},uid={500}\&gid={1000}\ rwid=$HSM_ARCHIVE_NUMBER"
+	$LCTL pcc list $MOUNT
+	do_facet $SINGLEAGT mkdir -p $DIR/$tdir
+	chmod 777 $DIR/$tdir || error "chmod 0777 $DIR/$tdir failed"
+
+	mkdir -p $DIR/$tdir/proj || error "mkdir $DIR/$tdir/proj failed"
+	mkdir -p $DIR/$tdir/proj2 || error "mkdir $DIR/$tdir/proj2 failed"
+	$LFS project -sp 100 $DIR/$tdir/proj ||
+		error "failed to set project for $DIR/$tdir/proj"
+	$LFS project -sp 200 $DIR/$tdir/proj2 ||
+		error "failed to set project for $DIR/$tdir/proj2"
+
+	file=$DIR/$tdir/proj/notcache
+	do_facet $SINGLEAGT dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	check_lpcc_state $file "none"
+	rm $file || error "rm $file failed"
+
+	file=$DIR/$tdir/proj/autocache.h5
+	do_facet $SINGLEAGT dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	check_lpcc_state $file "readwrite"
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
+		error "failed to detach $file"
+	rm $file || error "rm $file failed"
+
+	file=$DIR/$tdir/proj2/notcache
+	do_facet $SINGLEAGT dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	check_lpcc_state $file "none"
+	rm $file || error "rm $file failed"
+
+	file=$DIR/$tdir/proj2/autocache.h5
+	do_facet $SINGLEAGT dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	check_lpcc_state $file "readwrite"
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
+		error "failed to detach $file"
+	rm $file || error "rm $file failed"
+
+	file=$DIR/$tdir/ugidcache
+	myRUNAS="runas -u 500 -g 1000"
+	do_facet $SINGLEAGT $myRUNAS dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	check_lpcc_state $file "readwrite"
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
+		error "failed to detach $file"
+	rm $file || error "rm $file failed"
+}
+run_test 13c "Check auto RW-PCC create caching for UID/GID/ProjID/fname rule"
+
+test_14() {
+	local file=$DIR/$tdir/$tfile
+
+	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100}\ rwid=$HSM_ARCHIVE_NUMBER\ auto_attach=0"
+
+	mkdir -p $DIR/$tdir || error "mkdir -p $DIR/$tdir failed"
+	do_facet $SINGLEAGT "echo -n autodetach_data > $file"
+	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER \
+		$file || error "PCC attach $file failed"
+	check_lpcc_state $file "readwrite"
+
+	# Revoke the layout lock, the PCC-cached file will be
+	# detached automatically.
+	do_facet $SINGLEAGT $LCTL \
+		set_param ldlm.namespaces.*mdc*.lru_size=clear
+	check_file_data $SINGLEAGT $file "autodetach_data"
+	check_lpcc_state $file "none"
+}
+run_test 14 "Revocation of the layout lock should detach the file automatically"
+
+test_15() {
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tdir/$tfile
+
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
+	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
+	setup_pcc_mapping
+
+	mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed"
+	chmod 777 $DIR/$tdir || error "chmod 777 $DIR/$tdir failed"
+
+	echo "Check open attach for non-root user"
+	do_facet $SINGLEAGT $RUNAS dd if=/dev/zero of=$file bs=1024 count=1 ||
+		error "failed to dd write to $file"
+	do_facet $SINGLEAGT $RUNAS $LFS pcc attach -i $HSM_ARCHIVE_NUMBER \
+		$file || error "failed to attach file $file"
+	do_facet $SINGLEAGT $RUNAS $LFS pcc state $file
+	check_lpcc_state $file "readwrite" $SINGLEAGT "$RUNAS"
+	# Revoke the layout lock, the PCC-cached file will be
+	# detached automatically.
+	do_facet $SINGLEAGT $LCTL \
+		set_param ldlm.namespaces.*mdc*.lru_size=clear
+	check_lpcc_state $file "readwrite" $SINGLEAGT "$RUNAS"
+	# Detach the file but keep the cache , as the file layout generation
+	# is not changed, so the file is still valid cached in PCC, and can
+	# be reused from PCC cache directly.
+	do_facet $SINGLEAGT $RUNAS $LFS pcc detach -k $file ||
+		error "PCC detach $file failed"
+	check_lpcc_state $file "readwrite" $SINGLEAGT "$RUNAS"
+	do_facet $SINGLEAGT $RUNAS $LFS pcc detach $file ||
+		error "PCC detach $file failed"
+	rm $file || error "rm $file failed"
+
+	echo "check open attach for root user"
+	do_facet $SINGLEAGT "echo -n autoattach_data > $file"
+	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER \
+		$file || error "PCC attach $file failed"
+	check_lpcc_state $file "readwrite"
+
+	# Revoke the layout lock, the PCC-cached file will be
+	# detached automatically.
+	do_facet $SINGLEAGT $LCTL \
+		set_param ldlm.namespaces.*mdc*.lru_size=clear
+	check_file_data $SINGLEAGT $file "autoattach_data"
+	check_lpcc_state $file "readwrite"
+
+	# Detach the file with -k option, as the file layout generation
+	# is not changed, so the file is still valid cached in PCC,
+	# and can be reused from PCC cache directly.
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
+		error "PCC detach $file failed"
+	check_lpcc_state $file "readwrite"
+	# HSM released exists archived status
+	check_hsm_flags $file "0x0000000d"
+	check_file_data $SINGLEAGT $file "autoattach_data"
+
+	# HSM restore the PCC cached file, the layout generation
+	# was changed, so the file can not be auto attached.
+	$LFS hsm_restore $file || error "failed to restore $file"
+	wait_request_state $(path2fid $file) RESTORE SUCCEED
+	check_lpcc_state $file "none"
+	# HSM exists archived status
+	check_hsm_flags $file "0x00000009"
+
+}
+run_test 15 "Test auto attach at open when file is still valid cached"
+
+test_16() {
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tfile
+	local -a lpcc_path
+
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
+	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
+	setup_pcc_mapping
+
+	do_facet $SINGLEAGT "echo -n detach_data > $file"
+	lpcc_path=$(lpcc_fid2path $hsm_root $file)
+	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER \
+		$file || error "PCC attach $file failed"
+	check_lpcc_state $file "readwrite"
+	# HSM released exists archived status
+	check_hsm_flags $file "0x0000000d"
+
+	echo "Test for reusing valid PCC cache"
+	# Valid PCC cache can be reused
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
+		error "PCC detach $file failed"
+	check_lpcc_state $file "readwrite"
+	# HSM released exists archived status
+	check_hsm_flags $file "0x0000000d"
+
+	echo "Test for the default detach"
+	# Permanent detach by default, it will remove the PCC copy
+	do_facet $SINGLEAGT $LFS pcc detach $file ||
+		error "PCC detach $file failed"
+	wait_request_state $(path2fid $file) REMOVE SUCCEED
+	check_lpcc_state $file "none"
+	# File is removed from PCC backend
+	check_hsm_flags $file "0x00000000"
+	do_facet $SINGLEAGT "[ -f $lpcc_path ]"	&&
+		error "RW-PCC cached file '$lpcc_path' should be removed"
+
+	return 0
+}
+run_test 16 "Test detach with different options"
+
+test_17() {
+	local agt_host=$(facet_active_host $SINGLEAGT)
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tfile
+
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
+	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100}\ rwid=$HSM_ARCHIVE_NUMBER\ open_attach=0\ stat_attach=0"
+
+	do_facet $SINGLEAGT $LCTL pcc list $MOUNT
+
+	do_facet $SINGLEAGT "echo -n layout_refresh_data > $file"
+	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
+		error "PCC attach $file failed"
+	check_lpcc_state $file "readwrite"
+
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
+		error "PCC detach $file failed"
+	check_lpcc_state $file "none"
+
+	# Truncate should attach the file into PCC automatically
+	# as the PCC copy is still valid.
+	echo "Verify auto attach during IO for truncate"
+	do_facet $SINGLEAGT $TRUNCATE $file 4 || error "truncate $file failed"
+	check_lpcc_state $file "readwrite"
+
+	echo "Verify auto attach during IO for read/write"
+	rmultiop_start $agt_host $file O_r || error "open $file failed"
+	sleep 3
+
+	# Revoke the layout lock, the PCC-cached file will be
+	# detached automatically.
+	do_facet $SINGLEAGT $LCTL \
+		set_param ldlm.namespaces.*mdc*.lru_size=clear
+
+	check_lpcc_state $file "none"
+	rmultiop_stop $agt_host || error "close $file failed"
+	sleep 3
+	check_lpcc_state $file "readwrite"
+
+	do_facet $SINGLEAGT $LFS pcc detach -k $file ||
+		error "PCC detach $file failed"
+	check_lpcc_state $file "none"
+}
+run_test 17 "Test auto attach for layout refresh"
+
+test_18() {
+	local agt_host=$(facet_active_host $SINGLEAGT)
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tfile
+	local oldmd5
+	local newmd5
+
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
+	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100}\ rwid=$HSM_ARCHIVE_NUMBER"
+
+	do_facet $SINGLEAGT $LCTL pcc list $MOUNT
+	do_facet $SINGLEAGT dd if=/dev/urandom of=$file bs=1M count=4 ||
+		error "failed to write $file"
+	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
+		error "failed to attach $file"
+	do_facet $SINGLEAGT $LFS pcc state $file
+	check_lpcc_state $file "readwrite"
+	do_facet $SINGLEAGT $LFS pcc detach --keep $file ||
+		error "failed to detach $file"
+	do_facet $SINGLEAGT $LFS pcc state $file
+	$CHECKSTAT -s 4194304 $file
+	dd if=/dev/zero of=$DIR2/$tfile seek=1k bs=1k count=1 ||
+		error "failed to write $DIR2/$tfile"
+	oldmd5=$(md5sum $DIR2/$tfile | awk '{print $1}')
+	$CHECKSTAT -s 1049600 $DIR2/$tfile || error "$DIR2/$tfile size wrong"
+
+	local lpcc_path=$(lpcc_fid2path $hsm_root $file)
+
+	do_facet $SINGLEAGT $LFS pcc state $file
+	check_file_size $SINGLEAGT $lpcc_path 4194304
+	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
+		error "failed to attach $file"
+	check_lpcc_sizes $SINGLEAGT $lpcc_path $file 1049600
+	newmd5=$(do_facet $SINGLEAGT md5sum $file | awk '{print $1}')
+	[ "$oldmd5" == "$newmd5" ] || error "md5sum differ: $oldmd5 != $newmd5"
+	do_facet $SINGLEAGT $LFS pcc detach $file ||
+		error "failed to detach $file"
+}
+run_test 18 "Verify size correctness after re-attach the file"
+
+test_19() {
+	local agt_host=$(facet_active_host $SINGLEAGT)
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tfile
+
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
+	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100}\ rwid=$HSM_ARCHIVE_NUMBER\ auto_attach=0"
+
+	do_facet $SINGLEAGT "echo -n QQQQQ > $file" || error "echo $file failed"
+	lpcc_path=$(lpcc_fid2path $hsm_root $file)
+	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
+		error "Failed to attach $file"
+	check_lpcc_state $file "readwrite"
+	check_lpcc_sizes $SINGLEAGT $file $lpcc_path 5
+	do_facet $SINGLEAGT $LFS pcc detach --keep $file ||
+		error "Failed to detach $file"
+	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
+		error "Failed to attach $file"
+	check_lpcc_sizes $SINGLEAGT $file $lpcc_path 5
+	do_facet $SINGLEAGT $LFS pcc detach --keep $file ||
+		error "Failed to detach $file"
+}
+run_test 19 "Verify the file re-attach works as expected"
+
+test_20() {
+	local agt_host=$(facet_active_host $SINGLEAGT)
+	local loopfile="$TMP/$tfile"
+	local mntpt="/mnt/pcc.$tdir"
+	local hsm_root="$mntpt/$tdir"
+	local file=$DIR/$tfile
+
+	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
+	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
+	setup_pcc_mapping $SINGLEAGT \
+		"projid={100}\ rwid=$HSM_ARCHIVE_NUMBER"
+
+	do_facet $SINGLEAGT "echo -n QQQQQ > $file" ||
+		error "echo $file failed"
+	do_facet $SINGLEAGT $LFS pcc attach -i $HSM_ARCHIVE_NUMBER $file ||
+		error "Failed to attach $file"
+	do_facet $SINGLEAGT "echo 3 > /proc/sys/vm/drop_caches"
+	check_lpcc_state $file "readwrite"
+	do_facet $SINGLEAGT $LFS pcc detach $file ||
+		error "Failed to detach $file"
+}
+run_test 20 "Auto attach works after the inode was once evicted from cache"
+
 complete $SECONDS
 check_and_cleanup_lustre
 exit_status