X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_hsm.c;h=58a106d2459fe8061066cc4dac5799fdd820e2a0;hb=c8e3992acf3039b2824725d41f90d9a3be3be921;hp=34d9fda934300e595ae87fdbbf46e917a0b6c547;hpb=32bd5051a518c57e35f51b7f3c7f739b5ef91b25;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c index 34d9fda..58a106d 100644 --- 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 #include "mdt_internal.h" /* Max allocation to satisfy single HSM RPC. */ @@ -70,7 +71,7 @@ int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj, /* pack HSM attributes */ lustre_hsm2buf(info->mti_xattr_buf, mh); - /* update SOM attributes */ + /* update HSM attributes */ buf->lb_buf = attrs; buf->lb_len = sizeof(*attrs); rc = mo_xattr_set(info->mti_env, next, buf, XATTR_NAME_HSM, 0); @@ -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); @@ -214,8 +215,7 @@ int mdt_hsm_state_get(struct tgt_session_info *tsi) lh = &info->mti_lh[MDT_LH_CHILD]; mdt_lock_reg_init(lh, LCK_PR); - rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP, - MDT_LOCAL_LOCK); + rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP); if (rc < 0) GOTO(out_ucred, rc); @@ -225,11 +225,6 @@ int mdt_hsm_state_get(struct tgt_session_info *tsi) if (rc) GOTO(out_unlock, rc); - if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT)) - mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1, - req_capsule_client_get(info->mti_pill, - &RMF_CAPA1)); - hus = req_capsule_server_get(tsi->tsi_pill, &RMF_HSM_USER_STATE); if (hus == NULL) GOTO(out_unlock, rc = -EPROTO); @@ -253,7 +248,7 @@ out: * * Archive number is changed iif the value is not 0. * The new flagset that will be computed should result in a coherent state. - * This function checks that are flags are compatible. + * This function checks that flags are compatible. * * This is MDS_HSM_STATE_SET RPC handler. */ @@ -281,18 +276,14 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi) lh = &info->mti_lh[MDT_LH_CHILD]; mdt_lock_reg_init(lh, LCK_PW); rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP | - MDS_INODELOCK_XATTR, MDT_LOCAL_LOCK); + MDS_INODELOCK_XATTR); if (rc < 0) GOTO(out_ucred, rc); - if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT)) - mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1, - req_capsule_client_get(info->mti_pill, &RMF_CAPA1)); - /* 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); } @@ -301,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); } @@ -351,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); } @@ -402,11 +393,6 @@ int mdt_hsm_action(struct tgt_session_info *tsi) if (rc) GOTO(out, rc = err_serious(rc)); - if (req_capsule_get_size(tsi->tsi_pill, &RMF_CAPA1, RCL_CLIENT)) - mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1, - req_capsule_client_get(info->mti_pill, - &RMF_CAPA1)); - /* Coordinator information */ hal_size = sizeof(*hal) + cfs_size_round(MTI_NAME_MAXLEN) /* fsname */ + @@ -475,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. * @@ -495,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; @@ -563,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; @@ -573,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);