Whamcloud - gitweb
LU-10699 hsm: remove struct hsm_compat_data_cb
[fs/lustre-release.git] / lustre / mdt / mdt_hsm_cdt_client.c
index aa4f123..7f40dcf 100644 (file)
@@ -23,7 +23,7 @@
  * (C) Copyright 2012 Commissariat a l'energie atomique et aux energies
  *     alternatives
  *
- * Copyright (c) 2013, 2014, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
  */
 /*
  * lustre/mdt/mdt_hsm_cdt_client.c
 #include "mdt_internal.h"
 
 /**
- * data passed to llog_cat_process() callback
- * to find compatible requests
- */
-struct hsm_compat_data_cb {
-       struct coordinator      *cdt;
-       struct hsm_action_list  *hal;
-};
-
-/**
  * llog_cat_process() callback, used to find record
  * compatibles with a new hsm_action_list
  * \param env [IN] environment
  * \param llh [IN] llog handle
  * \param hdr [IN] llog record
- * \param data [IN] cb data = hsm_compat_data_cb
+ * \param data [IN] cb data = hal
  * \retval 0 success
  * \retval -ve failure
  */
@@ -66,14 +57,12 @@ static int hsm_find_compatible_cb(const struct lu_env *env,
                                  struct llog_handle *llh,
                                  struct llog_rec_hdr *hdr, void *data)
 {
-       struct llog_agent_req_rec       *larr;
-       struct hsm_compat_data_cb       *hcdcb;
-       struct hsm_action_item          *hai;
-       int                              i;
+       struct llog_agent_req_rec *larr = (struct llog_agent_req_rec *)hdr;
+       struct hsm_action_list *hal = data;
+       struct hsm_action_item *hai;
+       int i;
        ENTRY;
 
-       larr = (struct llog_agent_req_rec *)hdr;
-       hcdcb = data;
        /* a compatible request must be WAITING or STARTED
         * and not a cancel */
        if ((larr->arr_status != ARS_WAITING &&
@@ -81,8 +70,8 @@ static int hsm_find_compatible_cb(const struct lu_env *env,
            larr->arr_hai.hai_action == HSMA_CANCEL)
                RETURN(0);
 
-       hai = hai_first(hcdcb->hal);
-       for (i = 0; i < hcdcb->hal->hal_count; i++, hai = hai_next(hai)) {
+       hai = hai_first(hal);
+       for (i = 0; i < hal->hal_count; i++, hai = hai_next(hai)) {
                /* if request is a CANCEL:
                 * if cookie set in the request, there is no need to find a
                 * compatible one, the cookie in the request is directly used.
@@ -99,8 +88,8 @@ static int hsm_find_compatible_cb(const struct lu_env *env,
 
                /* HSMA_NONE is used to find running request for some FID */
                if (hai->hai_action == HSMA_NONE) {
-                       hcdcb->hal->hal_archive_id = larr->arr_archive_id;
-                       hcdcb->hal->hal_flags = larr->arr_flags;
+                       hal->hal_archive_id = larr->arr_archive_id;
+                       hal->hal_flags = larr->arr_flags;
                        *hai = larr->arr_hai;
                        continue;
                }
@@ -109,9 +98,8 @@ static int hsm_find_compatible_cb(const struct lu_env *env,
                 */
                hai->hai_cookie = larr->arr_hai.hai_cookie;
                /* we read the archive number from the request we cancel */
-               if (hai->hai_action == HSMA_CANCEL &&
-                   hcdcb->hal->hal_archive_id == 0)
-                       hcdcb->hal->hal_archive_id = larr->arr_archive_id;
+               if (hai->hai_action == HSMA_CANCEL && hal->hal_archive_id == 0)
+                       hal->hal_archive_id = larr->arr_archive_id;
        }
        RETURN(0);
 }
@@ -129,9 +117,8 @@ static int hsm_find_compatible_cb(const struct lu_env *env,
 static int hsm_find_compatible(const struct lu_env *env, struct mdt_device *mdt,
                               struct hsm_action_list *hal)
 {
-       struct hsm_action_item          *hai;
-       struct hsm_compat_data_cb        hcdcb;
-       int                              rc, i, ok_cnt;
+       struct hsm_action_item *hai;
+       int rc, i, ok_cnt;
        ENTRY;
 
        ok_cnt = 0;
@@ -151,10 +138,7 @@ static int hsm_find_compatible(const struct lu_env *env, struct mdt_device *mdt,
        if (ok_cnt == hal->hal_count)
                RETURN(0);
 
-       hcdcb.cdt = &mdt->mdt_coordinator;
-       hcdcb.hal = hal;
-
-       rc = cdt_llog_process(env, mdt, hsm_find_compatible_cb, &hcdcb, 0, 0,
+       rc = cdt_llog_process(env, mdt, hsm_find_compatible_cb, hal, 0, 0,
                              READ);
 
        RETURN(rc);
@@ -281,47 +265,18 @@ hsm_action_permission(struct mdt_thread_info *mti,
        RETURN(*mask & (1UL << hsma) ? 0 : -EPERM);
 }
 
-/*
- * Coordinator external API
- */
-
-/**
- * register a list of requests
- * \param mti [IN]
- * \param hal [IN] list of requests
- * \retval 0 success
- * \retval -ve failure
- * in case of restore, caller must hold layout lock
- */
-int mdt_hsm_add_actions(struct mdt_thread_info *mti,
-                       struct hsm_action_list *hal)
+/* Process a single HAL. hsm_find_compatible has already been called
+ * on it. */
+static int mdt_hsm_register_hal(struct mdt_thread_info *mti,
+                               struct mdt_device *mdt,
+                               struct coordinator *cdt,
+                               struct hsm_action_list *hal)
 {
-       struct mdt_device       *mdt = mti->mti_mdt;
-       struct coordinator      *cdt = &mdt->mdt_coordinator;
        struct hsm_action_item  *hai;
        struct mdt_object       *obj = NULL;
-       int                      rc = 0, i;
+       int                      rc, i;
        struct md_hsm            mh;
        bool                     is_restore = false;
-       __u64                    compound_id;
-       ENTRY;
-
-       /* no coordinator started, so we cannot serve requests */
-       if (cdt->cdt_state == CDT_STOPPED)
-               RETURN(-EAGAIN);
-
-       if (!hal_is_sane(hal))
-               RETURN(-EINVAL);
-
-       compound_id = atomic_inc_return(&cdt->cdt_compound_id);
-
-       /* search for compatible request, if found hai_cookie is set
-        * to the request cookie
-        * it is also used to set the cookie for cancel request by FID
-        */
-       rc = hsm_find_compatible(mti->mti_env, mdt, hal);
-       if (rc)
-               GOTO(out, rc);
 
        hai = hai_first(hal);
        for (i = 0; i < hal->hal_count; i++, hai = hai_next(hai)) {
@@ -397,7 +352,7 @@ int mdt_hsm_add_actions(struct mdt_thread_info *mti,
                 * or we use the default if none found in lma
                 * this works also for archive because the default value is 0
                 * /!\ there is a side effect: in case of restore on multiple
-                * files which are in different backend, the initial compound
+                * files which are in different backend, the initial
                 * request will be split in multiple requests because we cannot
                 * warranty an agent can serve any combinaison of archive
                 * backend
@@ -411,50 +366,14 @@ int mdt_hsm_add_actions(struct mdt_thread_info *mti,
 
                /* if restore, take an exclusive lock on layout */
                if (hai->hai_action == HSMA_RESTORE) {
-                       struct cdt_restore_handle *crh;
-
                        /* in V1 only whole file is supported. */
                        if (hai->hai_extent.offset != 0)
                                GOTO(out, rc = -EPROTO);
 
-                       OBD_SLAB_ALLOC_PTR(crh, mdt_hsm_cdt_kmem);
-                       if (crh == NULL)
-                               GOTO(out, rc = -ENOMEM);
-
-                       crh->crh_fid = hai->hai_fid;
-                       /* in V1 only whole file is supported. However the
-                        * restore may be due to truncate. */
-                       crh->crh_extent.start = 0;
-                       crh->crh_extent.end = hai->hai_extent.length;
-
-                       mdt_lock_reg_init(&crh->crh_lh, LCK_EX);
-                       obj = mdt_object_find_lock(mti, &crh->crh_fid,
-                                                  &crh->crh_lh,
-                                                  MDS_INODELOCK_LAYOUT);
-                       if (IS_ERR(obj)) {
-                               rc = PTR_ERR(obj);
-                               CERROR("%s: cannot take layout lock for "
-                                      DFID": rc = %d\n", mdt_obd_name(mdt),
-                                      PFID(&crh->crh_fid), rc);
-                               OBD_SLAB_FREE_PTR(crh, mdt_hsm_cdt_kmem);
+                       rc = cdt_restore_handle_add(mti, cdt, &hai->hai_fid,
+                                                   &hai->hai_extent);
+                       if (rc < 0)
                                GOTO(out, rc);
-                       }
-
-                       /* we choose to not keep a keep a reference
-                        * on the object during the restore time which can be
-                        * very long */
-                       mdt_object_put(mti->mti_env, obj);
-
-                       mutex_lock(&cdt->cdt_restore_lock);
-                       if (unlikely((cdt->cdt_state == CDT_STOPPED) ||
-                                    (cdt->cdt_state == CDT_STOPPING))) {
-                               mutex_unlock(&cdt->cdt_restore_lock);
-                               mdt_object_unlock(mti, NULL, &crh->crh_lh, 1);
-                               OBD_SLAB_FREE_PTR(crh, mdt_hsm_cdt_kmem);
-                               GOTO(out, rc = -EAGAIN);
-                       }
-                       list_add_tail(&crh->crh_list, &cdt->cdt_restore_hdl);
-                       mutex_unlock(&cdt->cdt_restore_lock);
                }
 record:
                /*
@@ -466,8 +385,8 @@ record:
                 */
                OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_HSM_CDT_DELAY, cfs_fail_val);
                /* record request */
-               rc = mdt_agent_record_add(mti->mti_env, mdt, compound_id,
-                                         archive_id, flags, hai);
+               rc = mdt_agent_record_add(mti->mti_env, mdt, archive_id, flags,
+                                         hai);
                if (rc)
                        GOTO(out, rc);
        }
@@ -478,6 +397,49 @@ record:
                rc = 0;
 
        GOTO(out, rc);
+
+out:
+       return rc;
+}
+
+/*
+ * Coordinator external API
+ */
+
+/**
+ * register a list of requests
+ * \param mti [IN]
+ * \param hal [IN] list of requests
+ * \retval 0 success
+ * \retval -ve failure
+ * in case of restore, caller must hold layout lock
+ */
+int mdt_hsm_add_actions(struct mdt_thread_info *mti,
+                       struct hsm_action_list *hal)
+{
+       struct mdt_device       *mdt = mti->mti_mdt;
+       struct coordinator      *cdt = &mdt->mdt_coordinator;
+       int                      rc;
+       ENTRY;
+
+       /* no coordinator started, so we cannot serve requests */
+       if (cdt->cdt_state == CDT_STOPPED)
+               RETURN(-EAGAIN);
+
+       if (!hal_is_sane(hal))
+               RETURN(-EINVAL);
+
+       /* search for compatible request, if found hai_cookie is set
+        * to the request cookie
+        * it is also used to set the cookie for cancel request by FID
+        */
+       rc = hsm_find_compatible(mti->mti_env, mdt, hal);
+       if (rc)
+               GOTO(out, rc);
+
+       rc = mdt_hsm_register_hal(mti, mdt, cdt, hal);
+
+       GOTO(out, rc);
 out:
        /* if work has been added, signal the coordinator */
        if (rc == 0 || rc == -ENODATA)
@@ -498,24 +460,15 @@ out:
 bool mdt_hsm_restore_is_running(struct mdt_thread_info *mti,
                                const struct lu_fid *fid)
 {
-       struct mdt_device               *mdt = mti->mti_mdt;
-       struct coordinator              *cdt = &mdt->mdt_coordinator;
-       struct cdt_restore_handle       *crh;
-       bool                             rc = false;
+       struct coordinator *cdt = &mti->mti_mdt->mdt_coordinator;
+       bool is_running;
        ENTRY;
 
-       if (!fid_is_sane(fid))
-               RETURN(rc);
-
        mutex_lock(&cdt->cdt_restore_lock);
-       list_for_each_entry(crh, &cdt->cdt_restore_hdl, crh_list) {
-               if (lu_fid_eq(&crh->crh_fid, fid)) {
-                       rc = true;
-                       break;
-               }
-       }
+       is_running = (cdt_restore_handle_find(cdt, fid) != NULL);
        mutex_unlock(&cdt->cdt_restore_lock);
-       RETURN(rc);
+
+       RETURN(is_running);
 }
 
 /**