LU-7988 hsm: run HSM coordinator once per second at most

[fs/lustre-release.git] / lustre / mdt / mdt_hsm.c

diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c
index 20502b9..58a106d 100644 (file)
--- a/lustre/mdt/mdt_hsm.c
+++ b/lustre/mdt/mdt_hsm.c
@@ -22,9 +22,9 @@
 /*
  * Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies
  *                          alternatives
- *
- * Copyright (c) 2012, 2014, Intel Corporation.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * lustre/mdt/mdt_hsm.c
@@ -37,6 +37,7 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
+#include <lustre/lustre_errno.h>
 #include "mdt_internal.h"
 
 /* Max allocation to satisfy single HSM RPC. */
@@ -121,16 +122,16 @@ int mdt_hsm_progress(struct tgt_session_info *tsi)
 
        hpk->hpk_errval = lustre_errno_ntoh(hpk->hpk_errval);
 
-       CDEBUG(D_HSM, "Progress on "DFID": len="LPU64" err=%d\n",
+       CDEBUG(D_HSM, "Progress on "DFID": len=%llu : rc = %d\n",
               PFID(&hpk->hpk_fid), hpk->hpk_extent.length, hpk->hpk_errval);
 
        if (hpk->hpk_errval)
-               CDEBUG(D_HSM, "Copytool progress on "DFID" failed (%d); %s.\n",
+               CDEBUG(D_HSM, "Copytool progress on "DFID" failed : rc = %d; %s.\n",
                       PFID(&hpk->hpk_fid), hpk->hpk_errval,
                       hpk->hpk_flags & HP_FLAG_RETRY ? "will retry" : "fatal");
 
        if (hpk->hpk_flags & HP_FLAG_COMPLETED)
-               CDEBUG(D_HSM, "Finished "DFID" (%d) cancel cookie="LPX64"\n",
+               CDEBUG(D_HSM, "Finished "DFID" : rc = %d; cancel cookie=%#llx\n",
                       PFID(&hpk->hpk_fid), hpk->hpk_errval, hpk->hpk_cookie);
 
        info = tsi2mdt_info(tsi);
@@ -281,8 +282,8 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
 
        /* Detect out-of range masks */
        if ((hss->hss_setmask | hss->hss_clearmask) & ~HSM_FLAGS_MASK) {
-               CDEBUG(D_HSM, "Incompatible masks provided (set "LPX64
-                      ", clear "LPX64") vs supported set (%#x).\n",
+               CDEBUG(D_HSM, "Incompatible masks provided (set %#llx"
+                      ", clear %#llx) vs supported set (%#x).\n",
                       hss->hss_setmask, hss->hss_clearmask, HSM_FLAGS_MASK);
                GOTO(out_unlock, rc = -EINVAL);
        }
@@ -291,8 +292,8 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
         * NOT defined in HSM_USER_MASK. */
        if (((hss->hss_setmask | hss->hss_clearmask) & ~HSM_USER_MASK) &&
            !md_capable(mdt_ucred(info), CFS_CAP_SYS_ADMIN)) {
-               CDEBUG(D_HSM, "Incompatible masks provided (set "LPX64
-                      ", clear "LPX64") vs unprivileged set (%#x).\n",
+               CDEBUG(D_HSM, "Incompatible masks provided (set %#llx"
+                      ", clear %#llx) vs unprivileged set (%#x).\n",
                       hss->hss_setmask, hss->hss_clearmask, HSM_USER_MASK);
                GOTO(out_unlock, rc = -EPERM);
        }
@@ -341,7 +342,7 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
            (flags & HS_RELEASED && !(flags & HS_ARCHIVED)) ||
            (flags & HS_LOST     && !(flags & HS_ARCHIVED))) {
                CDEBUG(D_HSM, "Incompatible flag change on "DFID
-                             "flags="LPX64"\n",
+                             "flags=%#llx\n",
                       PFID(&info->mti_body->mbo_fid1), flags);
                GOTO(out_unlock, rc = -EINVAL);
        }
@@ -460,6 +461,22 @@ out:
        return rc;
 }
 
+/* Return true if a FID is present in an action list. */
+static bool is_fid_in_hal(struct hsm_action_list *hal, const lustre_fid *fid)
+{
+       struct hsm_action_item *hai;
+       int i;
+
+       for (hai = hai_first(hal), i = 0;
+            i < hal->hal_count;
+            i++, hai = hai_next(hai)) {
+               if (lu_fid_eq(&hai->hai_fid, fid))
+                       return true;
+       }
+
+       return false;
+}
+
 /**
  * Process the HSM actions described in a struct hsm_user_request.
  *
@@ -480,7 +497,6 @@ int mdt_hsm_request(struct tgt_session_info *tsi)
        int                              hui_list_size;
        int                              data_size;
        enum hsm_copytool_action         action = HSMA_NONE;
-       __u64                            compound_id;
        int                              hal_size, i, rc;
        ENTRY;
 
@@ -548,9 +564,14 @@ int mdt_hsm_request(struct tgt_session_info *tsi)
        obd_uuid2fsname(hal->hal_fsname, mdt_obd_name(info->mti_mdt),
                        MTI_NAME_MAXLEN);
 
-       hal->hal_count = hr->hr_itemcount;
+       hal->hal_count = 0;
        hai = hai_first(hal);
        for (i = 0; i < hr->hr_itemcount; i++, hai = hai_next(hai)) {
+               /* Get rid of duplicate entries. Otherwise we get
+                * duplicated work in the llog. */
+               if (is_fid_in_hal(hal, &hui[i].hui_fid))
+                       continue;
+
                hai->hai_action = action;
                hai->hai_cookie = 0;
                hai->hai_gid = 0;
@@ -558,9 +579,11 @@ int mdt_hsm_request(struct tgt_session_info *tsi)
                hai->hai_extent = hui[i].hui_extent;
                memcpy(hai->hai_data, data, hr->hr_data_len);
                hai->hai_len = sizeof(*hai) + hr->hr_data_len;
+
+               hal->hal_count++;
        }
 
-       rc = mdt_hsm_add_actions(info, hal, &compound_id);
+       rc = mdt_hsm_add_actions(info, hal);
 
        MDT_HSM_FREE(hal, hal_size);