Revert "LU-4640 mdt: implement Remove Archive on Last Unlink policy"

This causes massive testing failures tracked in LU-7881

This reverts commit 74d92933108dc64b110a843352cf3336dca249d0.

Change-Id: Ie7f6d3b217b82bc0be02b8e418acf83f6b83b5cb
Reviewed-on: http://review.whamcloud.com/18925
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Tested-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/mdt/mdt_coordinator.c b/lustre/mdt/mdt_coordinator.c
index daf8d95..27ff1e3 100644 (file)
--- a/lustre/mdt/mdt_coordinator.c
+++ b/lustre/mdt/mdt_coordinator.c
@@ -915,13 +915,6 @@ int mdt_hsm_cdt_init(struct mdt_device *mdt)
        cdt->cdt_policy = CDT_DEFAULT_POLICY;
        cdt->cdt_active_req_timeout = 3600;
 
        cdt->cdt_policy = CDT_DEFAULT_POLICY;
        cdt->cdt_active_req_timeout = 3600;
 

-       /* Initialize cdt_compound_id here to allow its usage for
-        * delayed requests from RAoLU policy */
-       atomic_set(&cdt->cdt_compound_id, cfs_time_current_sec());
-
-       /* by default do not remove archives on last unlink */
-       cdt->cdt_remove_archive_on_last_unlink = false;
-

        RETURN(0);
 }
 
        RETURN(0);
 }
 


@@ -973,6 +966,7 @@ int mdt_hsm_cdt_start(struct mdt_device *mdt)
 
        cdt->cdt_state = CDT_INIT;
 
 
        cdt->cdt_state = CDT_INIT;
 

+       atomic_set(&cdt->cdt_compound_id, cfs_time_current_sec());

        /* just need to be larger than previous one */
        /* cdt_last_cookie is protected by cdt_llog_lock */
        cdt->cdt_last_cookie = cfs_time_current_sec();
        /* just need to be larger than previous one */
        /* cdt_last_cookie is protected by cdt_llog_lock */
        cdt->cdt_last_cookie = cfs_time_current_sec();


@@ -2212,36 +2206,6 @@ mdt_hsm_other_request_mask_seq_write(struct file *file, const char __user *buf,
                                           &cdt->cdt_other_request_mask);
 }
 
                                           &cdt->cdt_other_request_mask);
 }
 

-static int mdt_hsm_cdt_raolu_seq_show(struct seq_file *m, void *data)
-{
-       struct mdt_device       *mdt = m->private;
-       struct coordinator      *cdt = &mdt->mdt_coordinator;
-       ENTRY;
-
-       seq_printf(m, "%d\n", (int)cdt->cdt_remove_archive_on_last_unlink);
-       RETURN(0);
-}
-
-static ssize_t
-mdt_hsm_cdt_raolu_seq_write(struct file *file, const char __user *buffer,
-                         size_t count, loff_t *off)
-
-{
-       struct seq_file         *m = file->private_data;
-       struct mdt_device       *mdt = m->private;
-       struct coordinator      *cdt = &mdt->mdt_coordinator;
-       int                      val;
-       int                      rc;
-       ENTRY;
-
-       rc = lprocfs_write_helper(buffer, count, &val);
-       if (rc < 0)
-               RETURN(rc);
-
-       cdt->cdt_remove_archive_on_last_unlink = val;
-       RETURN(count);
-}
-

 LPROC_SEQ_FOPS(mdt_hsm_cdt_loop_period);
 LPROC_SEQ_FOPS(mdt_hsm_cdt_grace_delay);
 LPROC_SEQ_FOPS(mdt_hsm_cdt_active_req_timeout);
 LPROC_SEQ_FOPS(mdt_hsm_cdt_loop_period);
 LPROC_SEQ_FOPS(mdt_hsm_cdt_grace_delay);
 LPROC_SEQ_FOPS(mdt_hsm_cdt_active_req_timeout);


@@ -2250,7 +2214,6 @@ LPROC_SEQ_FOPS(mdt_hsm_cdt_default_archive_id);
 LPROC_SEQ_FOPS(mdt_hsm_user_request_mask);
 LPROC_SEQ_FOPS(mdt_hsm_group_request_mask);
 LPROC_SEQ_FOPS(mdt_hsm_other_request_mask);
 LPROC_SEQ_FOPS(mdt_hsm_user_request_mask);
 LPROC_SEQ_FOPS(mdt_hsm_group_request_mask);
 LPROC_SEQ_FOPS(mdt_hsm_other_request_mask);

-LPROC_SEQ_FOPS(mdt_hsm_cdt_raolu);

 
 static struct lprocfs_vars lprocfs_mdt_hsm_vars[] = {
        { .name =       "agents",
 
 static struct lprocfs_vars lprocfs_mdt_hsm_vars[] = {
        { .name =       "agents",


@@ -2278,7 +2241,5 @@ static struct lprocfs_vars lprocfs_mdt_hsm_vars[] = {
          .fops =       &mdt_hsm_group_request_mask_fops,       },
        { .name =       "other_request_mask",
          .fops =       &mdt_hsm_other_request_mask_fops,       },
          .fops =       &mdt_hsm_group_request_mask_fops,       },
        { .name =       "other_request_mask",
          .fops =       &mdt_hsm_other_request_mask_fops,       },

-       { .name =       "remove_archive_on_last_unlink",
-         .fops =       &mdt_hsm_cdt_raolu_fops,                },

        { 0 }
 };
        { 0 }
 };

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 82cb920..3f16666 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -5060,7 +5060,6 @@ static int mdt_export_cleanup(struct obd_export *exp)
 
        if (!list_empty(&closing_list)) {
                struct md_attr *ma = &info->mti_attr;
 
        if (!list_empty(&closing_list)) {
                struct md_attr *ma = &info->mti_attr;

-               struct mdt_object *o;

 
                /* Close any open files (which may also cause orphan
                 * unlinking). */
 
                /* Close any open files (which may also cause orphan
                 * unlinking). */


@@ -5090,13 +5089,7 @@ static int mdt_export_cleanup(struct obd_export *exp)
                                ma->ma_valid = MA_FLAGS;
                                ma->ma_attr_flags |= MDS_KEEP_ORPHAN;
                        }
                                ma->ma_valid = MA_FLAGS;
                                ma->ma_attr_flags |= MDS_KEEP_ORPHAN;
                        }

-
-                       /* Do not lose object before last unlink. */
-                       o = mfd->mfd_object;
-                       mdt_object_get(info->mti_env, o);

                         mdt_mfd_close(info, mfd);
                         mdt_mfd_close(info, mfd);

-                       mdt_handle_last_unlink(info, o, ma);
-                       mdt_object_put(info->mti_env, o);

                 }
         }
         info->mti_mdt = NULL;
                 }
         }
         info->mti_mdt = NULL;

diff --git a/lustre/mdt/mdt_hsm_cdt_requests.c b/lustre/mdt/mdt_hsm_cdt_requests.c
index 2b672a6..bbd7f44 100644 (file)
--- a/lustre/mdt/mdt_hsm_cdt_requests.c
+++ b/lustre/mdt/mdt_hsm_cdt_requests.c
@@ -434,9 +434,8 @@ struct cdt_agent_req *mdt_cdt_update_request(struct coordinator *cdt,
 
        car->car_req_update = cfs_time_current_sec();
 
 
        car->car_req_update = cfs_time_current_sec();
 

-       /* update data move progress done by copy tool */
-       if (car->car_hai->hai_action != HSMA_REMOVE && pgs->hpk_errval == 0 &&
-           pgs->hpk_extent.length != 0) {
+       /* update progress done by copy tool */
+       if (pgs->hpk_errval == 0 && pgs->hpk_extent.length != 0) {

                rc = hsm_update_work(&car->car_progress, &pgs->hpk_extent);
                if (rc) {
                        mdt_cdt_put_request(car);
                rc = hsm_update_work(&car->car_progress, &pgs->hpk_extent);
                if (rc) {
                        mdt_cdt_put_request(car);

diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h
index e32d754..d6256fd 100644 (file)
--- a/lustre/mdt/mdt_internal.h
+++ b/lustre/mdt/mdt_internal.h
@@ -148,9 +148,6 @@ struct coordinator {
        __u64                    cdt_user_request_mask;
        __u64                    cdt_group_request_mask;
        __u64                    cdt_other_request_mask;
        __u64                    cdt_user_request_mask;
        __u64                    cdt_group_request_mask;
        __u64                    cdt_other_request_mask;

-
-       /* Remove archive on last unlink policy */
-       bool                    cdt_remove_archive_on_last_unlink;

 };
 
 /* mdt state flag bits */
 };
 
 /* mdt state flag bits */


@@ -703,7 +700,7 @@ int mdt_add_dirty_flag(struct mdt_thread_info *info, struct mdt_object *mo,
                        struct md_attr *ma);
 int mdt_fix_reply(struct mdt_thread_info *info);
 int mdt_handle_last_unlink(struct mdt_thread_info *, struct mdt_object *,
                        struct md_attr *ma);
 int mdt_fix_reply(struct mdt_thread_info *info);
 int mdt_handle_last_unlink(struct mdt_thread_info *, struct mdt_object *,

-                          struct md_attr *);
+                           const struct md_attr *);

 void mdt_reconstruct_open(struct mdt_thread_info *, struct mdt_lock_handle *);
 
 struct lu_buf *mdt_buf(const struct lu_env *env, void *area, ssize_t len);
 void mdt_reconstruct_open(struct mdt_thread_info *, struct mdt_lock_handle *);
 
 struct lu_buf *mdt_buf(const struct lu_env *env, void *area, ssize_t len);

diff --git a/lustre/mdt/mdt_lib.c b/lustre/mdt/mdt_lib.c
index 62d9b8b..b018176 100644 (file)
--- a/lustre/mdt/mdt_lib.c
+++ b/lustre/mdt/mdt_lib.c
@@ -809,108 +809,23 @@ int mdt_fix_reply(struct mdt_thread_info *info)
 /* if object is dying, pack the lov/llog data,
  * parameter info->mti_attr should be valid at this point! */
 int mdt_handle_last_unlink(struct mdt_thread_info *info, struct mdt_object *mo,
 /* if object is dying, pack the lov/llog data,
  * parameter info->mti_attr should be valid at this point! */
 int mdt_handle_last_unlink(struct mdt_thread_info *info, struct mdt_object *mo,

-                          struct md_attr *ma)
+                           const struct md_attr *ma)

 {
 {

-       struct mdt_body      *repbody = NULL;
+        struct mdt_body       *repbody;

         const struct lu_attr *la = &ma->ma_attr;
         const struct lu_attr *la = &ma->ma_attr;

-       struct coordinator   *cdt = &info->mti_mdt->mdt_coordinator;
-       int                  rc;
-       __u64                need = 0;
-       struct hsm_action_item hai = {
-               .hai_len = sizeof(hai),
-               .hai_action = HSMA_REMOVE,
-               .hai_extent.length = -1,
-               .hai_cookie = 0,
-               .hai_gid = 0,
-       };
-       __u64 compound_id;
-       int archive_id;
-

         ENTRY;
 
         ENTRY;
 

-       if (mdt_info_req(info) != NULL) {
-               repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
-               LASSERT(repbody != NULL);
-       } else {
-               CDEBUG(D_INFO, "not running in a request/reply context\n");
-       }
+        repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
+        LASSERT(repbody != NULL);

 
 

-       if ((ma->ma_valid & MA_INODE) && repbody != NULL)
+        if (ma->ma_valid & MA_INODE)

                 mdt_pack_attr2body(info, repbody, la, mdt_object_fid(mo));
 
                 mdt_pack_attr2body(info, repbody, la, mdt_object_fid(mo));
 

-       if (ma->ma_valid & MA_LOV) {
+        if (ma->ma_valid & MA_LOV) {

                CERROR("No need in LOV EA upon unlink\n");
                dump_stack();
                CERROR("No need in LOV EA upon unlink\n");
                dump_stack();

-       }
-       if (repbody != NULL)
-               repbody->mbo_eadatasize = 0;
-
-       /* Only check unlinked and archived if RAoLU and upon last close */
-       if (!cdt->cdt_remove_archive_on_last_unlink ||
-           atomic_read(&mo->mot_open_count) != 0)
-               RETURN(0);
-
-       if (ma->ma_valid & MA_INODE) {
-               if (ma->ma_attr.la_nlink != 0)
-                       RETURN(0);
-       } else {
-               need |= MA_INODE;
-       }
-
-       if (ma->ma_valid & MA_HSM) {
-               if (!(ma->ma_hsm.mh_flags & HS_EXISTS))
-                       RETURN(0);
-       } else {
-               need |= MA_HSM;
-       }
-
-       if (need != 0) {
-               ma->ma_need |= need;
-               rc = mdt_attr_get_complex(info, mo, ma);
-               if (rc) {
-                       CERROR("%s: unable to fetch missing attributes of"
-                              DFID": rc=%d\n", mdt_obd_name(info->mti_mdt),
-                              PFID(mdt_object_fid(mo)), rc);
-                       RETURN(0);
-               }
-
-               if (need & MA_INODE) {
-                       if (ma->ma_valid & MA_INODE) {
-                               if (ma->ma_attr.la_nlink != 0)
-                                       RETURN(0);
-                       } else {
-                               RETURN(0);
-                       }
-               }
-
-               if (need & MA_HSM) {
-                       if (ma->ma_valid & MA_HSM) {
-                               if (!(ma->ma_hsm.mh_flags & HS_EXISTS))
-                                       RETURN(0);
-                       } else {
-                               RETURN(0);
-                       }
-               }
-       }
-
-       /* RAoLU policy is active, last close on file has occured,
-        * file is unlinked, file is archived, so create remove request
-        * for copytool!
-        * If CDT is not running, requests will be logged for later. */
-       compound_id = atomic_inc_return(&cdt->cdt_compound_id);
-       if (ma->ma_hsm.mh_arch_id != 0)
-               archive_id = ma->ma_hsm.mh_arch_id;
-       else
-               archive_id = cdt->cdt_default_archive_id;
-
-       hai.hai_fid = *mdt_object_fid(mo);
-
-       rc = mdt_agent_record_add(info->mti_env, info->mti_mdt,
-                                 compound_id, archive_id, 0, &hai);
-       if (rc)
-               CERROR("%s: unable to add HSM remove request for "DFID
-                      ": rc=%d\n", mdt_obd_name(info->mti_mdt),
-                      PFID(mdt_object_fid(mo)), rc);
+        }
+       repbody->mbo_eadatasize = 0;

 
         RETURN(0);
 }
 
         RETURN(0);
 }

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index f716949..44d50f7 100644 (file)
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -2036,7 +2036,8 @@ int mdt_close_internal(struct mdt_thread_info *info, struct ptlrpc_request *req,
                o = mfd->mfd_object;
                mdt_object_get(info->mti_env, o);
                ret = mdt_mfd_close(info, mfd);
                o = mfd->mfd_object;
                mdt_object_get(info->mti_env, o);
                ret = mdt_mfd_close(info, mfd);

-               rc = mdt_handle_last_unlink(info, o, ma);
+               if (repbody != NULL)
+                       rc = mdt_handle_last_unlink(info, o, ma);

                mdt_object_put(info->mti_env, o);
        }
 
                mdt_object_put(info->mti_env, o);
        }
 

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index bdabe10..f73a502 100755 (executable)
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -2255,270 +2255,6 @@ test_26() {
 }
 run_test 26 "Remove the archive of a valid file"
 
 }
 run_test 26 "Remove the archive of a valid file"
 

-cleanup_test_26a() {
-       trap 0
-       set_hsm_param remove_archive_on_last_unlink 0
-       set_hsm_param loop_period $orig_loop_period
-       set_hsm_param grace_delay $orig_grace_delay
-       copytool_cleanup
-}
-
-test_26a() {
-       local raolu=$(get_hsm_param remove_archive_on_last_unlink)
-       [[ $raolu -eq 0 ]] || error "RAoLU policy should be off"
-
-       # test needs a running copytool
-       copytool_setup
-
-       mkdir -p $DIR/$tdir
-       local f=$DIR/$tdir/$tfile
-       local fid=$(copy_file /etc/passwd $f)
-
-       $LFS hsm_archive --archive $HSM_ARCHIVE_NUMBER $f
-       wait_request_state $fid ARCHIVE SUCCEED
-
-       rm -f $f
-
-       local f2=$DIR/$tdir/${tfile}_2
-       local fid2=$(copy_file /etc/passwd $f2)
-
-       $LFS hsm_archive --archive $HSM_ARCHIVE_NUMBER $f2
-       wait_request_state $fid2 ARCHIVE SUCCEED
-
-       cat $f2 > /dev/null
-
-       local f3=$DIR/$tdir/${tfile}_3
-       local fid3=$(copy_file /etc/passwd $f3)
-
-       $LFS hsm_archive --archive $HSM_ARCHIVE_NUMBER $f3
-       wait_request_state $fid3 ARCHIVE SUCCEED
-
-       local f4=$DIR/$tdir/${tfile}_4
-       local fid4=$(copy_file /etc/passwd $f4)
-
-       $LFS hsm_archive --archive $HSM_ARCHIVE_NUMBER $f4
-       wait_request_state $fid4 ARCHIVE SUCCEED
-
-       trap cleanup_test_26a EXIT
-
-       # set a long grace_delay vs short loop_period
-       local orig_loop_period=$(get_hsm_param loop_period)
-       local orig_grace_delay=$(get_hsm_param grace_delay)
-       set_hsm_param loop_period 10
-       set_hsm_param grace_delay 100
-
-       set_hsm_param remove_archive_on_last_unlink 1
-
-       rm -f $f3
-       cat $f4 > /dev/null
-       local f4bis=$DIR/$tdir/${tfile}_4bis
-       ln $f4 $f4bis
-       [[ $? -eq 0 ]] || error "Unable to create hard-link"
-       rm -f $f4
-
-       # Since CDT is not signaled for RAoLU requests to be sure it
-       # will wake-up to send remove request and copytool will process
-       # it, wait for loop_period + some extra-time.
-       local loop_period=$(get_hsm_param loop_period)
-       sleep $((loop_period + 5))
-
-       set_hsm_param remove_archive_on_last_unlink 0
-
-       do_facet $SINGLEAGT ls $HSM_ARCHIVE'/*/*/*/*/*/*/'$fid
-       [[ $? -eq 0 ]] || error "File being removed on archive"
-
-       do_facet $SINGLEAGT ls $HSM_ARCHIVE'/*/*/*/*/*/*/'$fid2
-       [[ $? -eq 0 ]] || error "File being removed on archive"
-
-       do_facet $SINGLEAGT ls $HSM_ARCHIVE'/*/*/*/*/*/*/'$fid3
-       [[ $? -eq 0 ]] && error "File not being removed on archive"
-
-       do_facet $SINGLEAGT ls $HSM_ARCHIVE'/*/*/*/*/*/*/'$fid4
-       [[ $? -eq 0 ]] || error "File being removed on archive"
-
-       # previous actions elapsed time should be < grace_delay
-       wait_request_state $fid3 REMOVE SUCCEED
-
-       cleanup_test_26a
-}
-run_test 26a "Remove Archive On Last Unlink (RAoLU) policy"
-
-cleanup_test_26b() {
-       trap 0
-       set_hsm_param remove_archive_on_last_unlink 0
-       copytool_cleanup
-}
-
-test_26b() {
-
-       # test needs a running copytool
-       copytool_setup
-
-       mkdir -p $DIR/$tdir
-       local f=$DIR/$tdir/$tfile
-       local fid=$(copy_file /etc/passwd $f)
-
-       $LFS hsm_archive --archive $HSM_ARCHIVE_NUMBER $f
-       wait_request_state $fid ARCHIVE SUCCEED
-
-       trap cleanup_test_26b EXIT
-
-       set_hsm_param remove_archive_on_last_unlink 1
-
-       cdt_shutdown
-       cdt_check_state stopped
-
-       rm -f $f
-
-       set_hsm_param remove_archive_on_last_unlink 0
-
-       wait_request_state $fid REMOVE WAITING
-
-       cdt_enable
-       # copytool must re-register
-       search_and_kill_copytool
-       sleep 5
-       search_copytools && error "Copytool should have stopped"
-       HSM_ARCHIVE_PURGE=false copytool_setup
-
-       wait_request_state $fid REMOVE SUCCEED
-       do_facet $SINGLEAGT ls $HSM_ARCHIVE'/*/*/*/*/*/*/'$fid
-       [[ $? -eq 0 ]] && error "File not being removed on archive"
-
-       cleanup_test_26b
-}
-run_test 26b "RAoLU policy when CDT off"
-
-cleanup_test_26c() {
-       trap 0
-       set_hsm_param remove_archive_on_last_unlink 0
-       set_hsm_param loop_period $orig_loop_period
-       set_hsm_param grace_delay $orig_grace_delay
-       copytool_cleanup
-}
-
-test_26c() {
-
-       # test needs a running copytool
-       copytool_setup
-
-       mkdir -p $DIR/$tdir
-       local f=$DIR/$tdir/$tfile
-       local fid=$(copy_file /etc/passwd $f)
-
-       $LFS hsm_archive --archive $HSM_ARCHIVE_NUMBER $f
-       wait_request_state $fid ARCHIVE SUCCEED
-
-       trap cleanup_test_26c EXIT
-
-       # set a long grace_delay vs short loop_period
-       local orig_loop_period=$(get_hsm_param loop_period)
-       local orig_grace_delay=$(get_hsm_param grace_delay)
-       set_hsm_param loop_period 10
-       set_hsm_param grace_delay 100
-
-       set_hsm_param remove_archive_on_last_unlink 1
-
-       multiop_bg_pause $f O_c || error "open $f failed"
-       local pid=$!
-       # give multiop a chance to open
-       sleep 2
-
-       rm -f $f
-
-       # Since CDT is not signaled for RAoLU requests to be sure it
-       # will wake-up to send remove request and copytool will process
-       # it, wait for loop_period + some extra-time.
-       local loop_period=$(get_hsm_param loop_period)
-       sleep $((loop_period + 5))
-
-       do_facet $SINGLEAGT ls $HSM_ARCHIVE'/*/*/*/*/*/*/'$fid
-       [[ $? -eq 0 ]] || error "File being removed on archive"
-
-       kill -USR1 $pid || error "multiop early exit"
-       # should reach autotest timeout if multiop fails to trap
-       # signal, close file, and exit ...
-       wait $pid || error
-
-       # again, wait for loop_period + some extra-time, to allow
-       # CDT enough time to handle remove request.
-       sleep $((loop_period + 5))
-
-       set_hsm_param remove_archive_on_last_unlink 0
-
-       do_facet $SINGLEAGT ls $HSM_ARCHIVE'/*/*/*/*/*/*/'$fid
-       [[ $? -eq 0 ]] && error "File not being removed on archive"
-
-       # previous actions elapsed time should be < grace_delay
-       wait_request_state $fid REMOVE SUCCEED
-
-       cleanup_test_26c
-}
-run_test 26c "RAoLU effective when file closed"
-
-cleanup_test_26d() {
-       trap 0
-       set_hsm_param remove_archive_on_last_unlink 0
-       set_hsm_param loop_period $orig_loop_period
-       set_hsm_param grace_delay $orig_grace_delay
-       copytool_cleanup
-}
-
-test_26d() {
-
-       # test needs a running copytool
-       copytool_setup
-
-       mkdir -p $DIR/$tdir
-       local f=$DIR/$tdir/$tfile
-       local fid=$(copy_file /etc/motd $f 1)
-
-       $LFS hsm_archive $f || error "could not archive file"
-       wait_request_state $fid ARCHIVE SUCCEED
-       check_hsm_flags $f "0x00000009"
-
-       trap cleanup_test_26d EXIT
-
-       # set a long grace_delay vs short loop_period
-       local orig_loop_period=$(get_hsm_param loop_period)
-       local orig_grace_delay=$(get_hsm_param grace_delay)
-       set_hsm_param loop_period 10
-       set_hsm_param grace_delay 100
-
-       set_hsm_param remove_archive_on_last_unlink 1
-
-       multiop_bg_pause $f O_c || error "multiop failed"
-       local MULTIPID=$!
-       # give multiop a chance to open
-       sleep 2
-
-       rm -f $f
-
-       mds_evict_client
-
-       # Since CDT is not signaled for RAoLU requests to be sure it
-       # will wake-up to send remove request and copytool will process
-       # it, wait for loop_period + some extra-time.
-       local loop_period=$(get_hsm_param loop_period)
-       sleep $((loop_period + 5))
-
-       set_hsm_param remove_archive_on_last_unlink 0
-
-       do_facet $SINGLEAGT ls $HSM_ARCHIVE'/*/*/*/*/*/*/'$fid
-       [[ $? -eq 0 ]] && error "File not being removed on archive"
-
-       # previous actions elapsed time should be < grace_delay
-       wait_request_state $fid REMOVE SUCCEED
-
-       client_up || client_up || true
-
-       kill -USR1 $MULTIPID
-       wait $MULTIPID || error "multiop close failed"
-
-       cleanup_test_26d
-}
-run_test 26d "RAoLU when Client eviction"
-

 test_27a() {
        # test needs a running copytool
        copytool_setup
 test_27a() {
        # test needs a running copytool
        copytool_setup