LU-8163 hsm: user_request_mask can't be unset in test 24c

[fs/lustre-release.git] / lustre / tests / sanity-hsm.sh

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index 014bf41..fd2f711 100755 (executable)
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -811,6 +811,66 @@ parse_json_event() {
        echo $raw_event | python -c "$json_parser"
 }
 
+get_agent_by_uuid_mdt() {
+       local uuid=$1
+       local mdtidx=$2
+       local mds=mds$(($mdtidx + 1))
+       do_facet $mds "$LCTL get_param -n ${MDT_PREFIX}${mdtidx}.hsm.agents |\
+                grep $uuid"
+}
+
+check_agent_registered_by_mdt() {
+       local uuid=$1
+       local mdtidx=$2
+       local mds=mds$(($mdtidx + 1))
+       local agent=$(get_agent_by_uuid_mdt $uuid $mdtidx)
+       if [[ ! -z "$agent" ]]; then
+               echo "found agent $agent on $mds"
+       else
+               error "uuid $uuid not found in agent list on $mds"
+       fi
+}
+
+check_agent_unregistered_by_mdt() {
+       local uuid=$1
+       local mdtidx=$2
+       local mds=mds$(($mdtidx + 1))
+       local agent=$(get_agent_by_uuid_mdt $uuid $mdtidx)
+       if [[ -z "$agent" ]]; then
+               echo "uuid not found in agent list on $mds"
+       else
+               error "uuid found in agent list on $mds: $agent"
+       fi
+}
+
+check_agent_registered() {
+       local uuid=$1
+       local mdsno
+       for mdsno in $(seq 1 $MDSCOUNT); do
+               check_agent_registered_by_mdt $uuid $((mdsno - 1))
+       done
+}
+
+check_agent_unregistered() {
+       local uuid=$1
+       local mdsno
+       for mdsno in $(seq 1 $MDSCOUNT); do
+               check_agent_unregistered_by_mdt $uuid $((mdsno - 1))
+       done
+}
+
+get_agent_uuid() {
+       local agent=${1:-$(facet_active_host $SINGLEAGT)}
+
+       # Lustre mount-point is mandatory and last parameter on
+       # copytool cmd-line.
+       local mntpnt=$(do_rpc_nodes $agent ps -C $HSMTOOL_BASE -o args= |
+                      awk '{print $NF}')
+       [ -n "$mntpnt" ] || error "Found no Agent or with no mount-point "\
+                                 "parameter"
+       do_rpc_nodes $agent get_client_uuid $mntpnt | cut -d' ' -f2
+}
+
 # initiate variables
 init_agt_vars
 
@@ -999,13 +1059,19 @@ test_8() {
 run_test 8 "Test default archive number"
 
 test_9() {
-       mkdir -p $DIR/$tdir
-       local f=$DIR/$tdir/$tfile
-       local fid=$(copy_file /etc/passwd $f)
        # we do not use the default one to be sure
        local new_an=$((HSM_ARCHIVE_NUMBER + 1))
        copytool_cleanup
        copytool_setup $SINGLEAGT $MOUNT $new_an
+
+       # give time for CT to register with MDTs
+       sleep $(($MDSCOUNT*2))
+       local uuid=$(get_agent_uuid $(facet_active_host $SINGLEAGT))
+       check_agent_registered $uuid
+
+       mkdir -p $DIR/$tdir
+       local f=$DIR/$tdir/$tfile
+       local fid=$(copy_file /etc/passwd $f)
        $LFS hsm_archive --archive $new_an $f
        wait_request_state $fid ARCHIVE SUCCEED
 
@@ -1704,7 +1770,8 @@ test_16() {
        $LFS hsm_archive $f
        wait_request_state $fid ARCHIVE SUCCEED
        local end=$(date +%s)
-       local duration=$((end - start))
+       # Add 1 to account for rounding errors between start and end (LU-8155)
+       local duration=$((end - start + 1))
 
        [[ $duration -ge $goal ]] ||
                error "Transfer is too fast $duration < $goal"
@@ -2065,7 +2132,6 @@ test_24c() {
        chown $RUNAS_ID:nobody $file ||
                error "cannot chown '$file' to '$RUNAS_ID:nobody'"
 
-       set_hsm_param user_request_mask ""
        $RUNAS $LFS hsm_$action $file &&
                error "$action by user should fail"
 
@@ -2079,7 +2145,6 @@ test_24c() {
        chown nobody:$RUNAS_GID $file ||
                error "cannot chown '$file' to 'nobody:$RUNAS_GID'"
 
-       set_hsm_param group_request_mask ""
        $RUNAS $LFS hsm_$action $file &&
                error "$action by group should fail"
 
@@ -2093,7 +2158,6 @@ test_24c() {
        chown nobody:nobody $file ||
                error "cannot chown '$file' to 'nobody:nobody'"
 
-       set_hsm_param other_request_mask ""
        $RUNAS $LFS hsm_$action $file &&
                error "$action by other should fail"
 
@@ -3567,66 +3631,6 @@ test_105() {
 }
 run_test 105 "Restart of coordinator"
 
-get_agent_by_uuid_mdt() {
-       local uuid=$1
-       local mdtidx=$2
-       local mds=mds$(($mdtidx + 1))
-       do_facet $mds "$LCTL get_param -n ${MDT_PREFIX}${mdtidx}.hsm.agents |\
-                grep $uuid"
-}
-
-check_agent_registered_by_mdt() {
-       local uuid=$1
-       local mdtidx=$2
-       local mds=mds$(($mdtidx + 1))
-       local agent=$(get_agent_by_uuid_mdt $uuid $mdtidx)
-       if [[ ! -z "$agent" ]]; then
-               echo "found agent $agent on $mds"
-       else
-               error "uuid $uuid not found in agent list on $mds"
-       fi
-}
-
-check_agent_unregistered_by_mdt() {
-       local uuid=$1
-       local mdtidx=$2
-       local mds=mds$(($mdtidx + 1))
-       local agent=$(get_agent_by_uuid_mdt $uuid $mdtidx)
-       if [[ -z "$agent" ]]; then
-               echo "uuid not found in agent list on $mds"
-       else
-               error "uuid found in agent list on $mds: $agent"
-       fi
-}
-
-check_agent_registered() {
-       local uuid=$1
-       local mdsno
-       for mdsno in $(seq 1 $MDSCOUNT); do
-               check_agent_registered_by_mdt $uuid $((mdsno - 1))
-       done
-}
-
-check_agent_unregistered() {
-       local uuid=$1
-       local mdsno
-       for mdsno in $(seq 1 $MDSCOUNT); do
-               check_agent_unregistered_by_mdt $uuid $((mdsno - 1))
-       done
-}
-
-get_agent_uuid() {
-       local agent=${1:-$(facet_active_host $SINGLEAGT)}
-
-       # Lustre mount-point is mandatory and last parameter on
-       # copytool cmd-line.
-       local mntpnt=$(do_rpc_nodes $agent ps -C $HSMTOOL_BASE -o args= |
-                      awk '{print $NF}')
-       [ -n "$mntpnt" ] || error "Found no Agent or with no mount-point "\
-                                 "parameter"
-       do_rpc_nodes $agent get_client_uuid $mntpnt | cut -d' ' -f2
-}
-
 test_106() {
        # test needs a running copytool
        copytool_setup