X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_hsm.c;h=6617277be450a00c95a23a1f67e68f30c0f4c32f;hb=789038c97ae1072874dcd6afcc9cd78e9c885368;hp=1e560d1def916a0a3083fbeb2e73019d18c6a1d7;hpb=393350b37cae30efc03ffc076c77e390999c2a2d;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c index 1e560d1..6617277 100644 --- a/lustre/mdt/mdt_hsm.c +++ b/lustre/mdt/mdt_hsm.c @@ -20,10 +20,11 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, 2013, Intel Corporation. - * Use is subject to license terms. * Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies * alternatives + * Use is subject to license terms. + * + * Copyright (c) 2012, 2015, Intel Corporation. */ /* * lustre/mdt/mdt_hsm.c @@ -36,6 +37,7 @@ #define DEBUG_SUBSYSTEM S_MDS +#include #include "mdt_internal.h" /* Max allocation to satisfy single HSM RPC. */ @@ -57,19 +59,19 @@ int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj, const struct md_hsm *mh) { - struct md_object *next = mdt_object_child(obj); - struct lu_buf *buf = &info->mti_buf; - struct hsm_attrs *attrs; - int rc; + struct md_object *next = mdt_object_child(obj); + struct lu_buf *buf = &info->mti_buf; + struct hsm_attrs *attrs; + int rc; ENTRY; attrs = (struct hsm_attrs *)info->mti_xattr_buf; - CLASSERT(sizeof(info->mti_xattr_buf) >= sizeof(*attrs)); + BUILD_BUG_ON(sizeof(info->mti_xattr_buf) < sizeof(*attrs)); /* 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); @@ -89,7 +91,7 @@ static inline bool mdt_hsm_is_admin(struct mdt_thread_info *info) if (rc < 0) return false; - is_admin = md_capable(mdt_ucred(info), CFS_CAP_SYS_ADMIN); + is_admin = cap_raised(mdt_ucred(info)->uc_cap, CAP_SYS_ADMIN); mdt_exit_ucred(info); @@ -120,23 +122,23 @@ 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); if (!mdt_hsm_is_admin(info)) GOTO(out, rc = -EPERM); - rc = mdt_hsm_coordinator_update(info, hpk); + rc = mdt_hsm_update_request_state(info, hpk); out: mdt_thread_info_fini(info); RETURN(rc); @@ -144,22 +146,49 @@ out: int mdt_hsm_ct_register(struct tgt_session_info *tsi) { - struct mdt_thread_info *info; - __u32 *archives; - int rc; + struct mdt_thread_info *info = tsi2mdt_info(tsi); + struct ptlrpc_request *req = mdt_info_req(info); + struct obd_export *exp = req->rq_export; + size_t archives_size; + __u32 *archives; + int archive_count; + int rc; ENTRY; + if (!mdt_hsm_is_admin(info)) + GOTO(out, rc = -EPERM); + archives = req_capsule_client_get(tsi->tsi_pill, &RMF_MDS_HSM_ARCHIVE); if (archives == NULL) - RETURN(err_serious(-EPROTO)); + GOTO(out, rc = err_serious(-EPROTO)); - info = tsi2mdt_info(tsi); - if (!mdt_hsm_is_admin(info)) - GOTO(out, rc = -EPERM); + archives_size = req_capsule_get_size(tsi->tsi_pill, + &RMF_MDS_HSM_ARCHIVE, RCL_CLIENT); + + /* compatibility check for the old clients */ + if (!exp_connect_archive_id_array(exp)) { + if (archives_size != sizeof(*archives)) + GOTO(out, rc = err_serious(-EPROTO)); + + /* XXX: directly include this function here? */ + rc = mdt_hsm_agent_register_mask(info, + &tsi->tsi_exp->exp_client_uuid, + *archives); + GOTO(out, rc); + } + + if (archives_size % sizeof(*archives) != 0) + GOTO(out, rc = err_serious(-EPROTO)); + + archive_count = archives_size / sizeof(*archives); + if (archive_count == 1 && *archives == 0) { + archive_count = 0; + archives = NULL; + } + + rc = mdt_hsm_agent_register(info, &tsi->tsi_exp->exp_client_uuid, + archive_count, archives); - /* XXX: directly include this function here? */ - rc = mdt_hsm_agent_register_mask(info, &tsi->tsi_exp->exp_client_uuid, - *archives); out: mdt_thread_info_fini(info); RETURN(rc); @@ -213,8 +242,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); @@ -224,11 +252,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); @@ -252,7 +275,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. */ @@ -280,19 +303,27 @@ 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 %#llx" + ", clear %#llx) vs supported set (%#x).\n", + hss->hss_setmask, hss->hss_clearmask, HSM_FLAGS_MASK); + GOTO(out_unlock, rc = -EINVAL); + } /* Non-root users are forbidden to set or clear flags which are * 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)) + !cap_raised(mdt_ucred(info)->uc_cap, CAP_SYS_ADMIN)) { + 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); + } /* Read current HSM info */ ma->ma_valid = 0; @@ -309,12 +340,24 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi) /* Change archive_id if provided. */ if (hss->hss_valid & HSS_ARCHIVE_ID) { + struct ptlrpc_request *req = mdt_info_req(info); + struct obd_export *exp = req->rq_export; + if (!(ma->ma_hsm.mh_flags & HS_EXISTS)) { CDEBUG(D_HSM, "Could not set an archive number for " DFID "if HSM EXISTS flag is not set.\n", PFID(&info->mti_body->mbo_fid1)); GOTO(out_unlock, rc); } + + if (!exp_connect_archive_id_array(exp) && + hss->hss_archive_id > LL_HSM_ORIGIN_MAX_ARCHIVE) { + CDEBUG(D_HSM, "archive id %u from old clients " + "exceeds maximum %zu.\n", + hss->hss_archive_id, LL_HSM_ORIGIN_MAX_ARCHIVE); + GOTO(out_unlock, rc = -EINVAL); + } + ma->ma_hsm.mh_arch_id = hss->hss_archive_id; } @@ -330,7 +373,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); } @@ -359,12 +402,12 @@ out: */ int mdt_hsm_action(struct tgt_session_info *tsi) { - struct mdt_thread_info *info; - struct hsm_current_action *hca; - struct hsm_action_list *hal = NULL; - struct hsm_action_item *hai; - int hal_size; - int rc; + struct mdt_thread_info *info; + struct hsm_current_action *hca; + enum hsm_copytool_action action; /* HSMA_* */ + enum agent_req_status status; /* ARS_* */ + struct hsm_extent extent; + int rc; ENTRY; hca = req_capsule_server_get(tsi->tsi_pill, @@ -378,47 +421,15 @@ int mdt_hsm_action(struct tgt_session_info *tsi) info = tsi2mdt_info(tsi); /* Only valid if client is remote */ rc = mdt_init_ucred(info, (struct mdt_body *)info->mti_body); - if (rc) + if (rc < 0) 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 */ + - cfs_size_round(sizeof(*hai)); - - MDT_HSM_ALLOC(hal, hal_size); - if (hal == NULL) - GOTO(out_ucred, rc = -ENOMEM); - - hal->hal_version = HAL_VERSION; - hal->hal_archive_id = 0; - hal->hal_flags = 0; - obd_uuid2fsname(hal->hal_fsname, mdt_obd_name(info->mti_mdt), - MTI_NAME_MAXLEN); - hal->hal_count = 1; - hai = hai_first(hal); - hai->hai_action = HSMA_NONE; - hai->hai_cookie = 0; - hai->hai_gid = 0; - hai->hai_fid = info->mti_body->mbo_fid1; - hai->hai_len = sizeof(*hai); - - rc = mdt_hsm_get_actions(info, hal); - if (rc) - GOTO(out_free, rc); - - /* cookie is used to give back request status */ - if (hai->hai_cookie == 0) - hca->hca_state = HPS_WAITING; - else - hca->hca_state = HPS_RUNNING; + rc = mdt_hsm_get_action(info, &info->mti_body->mbo_fid1, &action, + &status, &extent); + if (rc < 0) + GOTO(out_ucred, rc); - switch (hai->hai_action) { + switch (action) { case HSMA_NONE: hca->hca_action = HUA_NONE; break; @@ -437,16 +448,26 @@ int mdt_hsm_action(struct tgt_session_info *tsi) default: hca->hca_action = HUA_NONE; CERROR("%s: Unknown hsm action: %d on "DFID"\n", - mdt_obd_name(info->mti_mdt), - hai->hai_action, PFID(&hai->hai_fid)); + mdt_obd_name(info->mti_mdt), action, + PFID(&info->mti_body->mbo_fid1)); + break; + } + + switch (status) { + case ARS_WAITING: + hca->hca_state = HPS_WAITING; + break; + case ARS_STARTED: + hca->hca_state = HPS_RUNNING; + break; + default: + hca->hca_state = HPS_NONE; break; } - hca->hca_location = hai->hai_extent; + hca->hca_location = extent; EXIT; -out_free: - MDT_HSM_FREE(hal, hal_size); out_ucred: mdt_exit_ucred(info); out: @@ -454,6 +475,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 struct lu_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. * @@ -474,7 +511,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; @@ -542,9 +578,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; @@ -552,9 +593,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);