* (C) Copyright 2012 Commissariat a l'energie atomique et aux energies
* alternatives
*
- * Copyright (c) 2013, 2014, Intel Corporation.
+ * Copyright (c) 2013, 2016, Intel Corporation.
*/
/*
* lustre/mdt/mdt_hsm_cdt_actions.c
sz = larr->arr_hai.hai_len - sizeof(larr->arr_hai);
CDEBUG(D_HSM, "%slrh=[type=%X len=%d idx=%d] fid="DFID
" dfid="DFID
- " compound/cookie="LPX64"/"LPX64
- " status=%s action=%s archive#=%d flags="LPX64
- " create="LPU64" change="LPU64
- " extent="LPX64"-"LPX64" gid="LPX64" datalen=%d"
+ " compound/cookie=%#llx/%#llx"
+ " status=%s action=%s archive#=%d flags=%#llx"
+ " create=%llu change=%llu"
+ " extent=%#llx-%#llx gid=%#llx datalen=%d"
" data=[%s]\n",
prefix,
larr->arr_hdr.lrh_type,
/* in case of cancel request, the cookie is already set to the
* value of the request cookie to be cancelled
* so we do not change it */
- if (hai->hai_action != HSMA_CANCEL) {
+ if (hai->hai_action == HSMA_CANCEL) {
+ larr->arr_hai.hai_cookie = hai->hai_cookie;
+ } else {
cdt->cdt_last_cookie++;
- hai->hai_cookie = cdt->cdt_last_cookie;
+ larr->arr_hai.hai_cookie = cdt->cdt_last_cookie;
}
- larr->arr_hai.hai_cookie = hai->hai_cookie;
+
rc = llog_cat_add(env, lctxt->loc_handle, &larr->arr_hdr, NULL);
if (rc > 0)
rc = 0;
struct llog_agent_req_rec *larr;
struct data_update_cb *ducb;
int rc, i;
- int found;
ENTRY;
larr = (struct llog_agent_req_rec *)hdr;
ducb = data;
- found = 0;
/* check if all done */
if (ducb->cookies_count == ducb->cookies_done)
rc = 0;
for (i = 0 ; i < ducb->cookies_count ; i++) {
- CDEBUG(D_HSM, "%s: search "LPX64", found "LPX64"\n",
+ CDEBUG(D_HSM, "%s: search %#llx, found %#llx\n",
mdt_obd_name(ducb->mdt), ducb->cookies[i],
larr->arr_hai.hai_cookie);
if (larr->arr_hai.hai_cookie == ducb->cookies[i]) {
larr->arr_status = ducb->status;
larr->arr_req_change = ducb->change_time;
- rc = mdt_agent_llog_update_rec(env, ducb->mdt, llh,
- larr);
+ rc = llog_write(env, llh, hdr, hdr->lrh_index);
ducb->cookies_done++;
- found = 1;
break;
}
}
CERROR("%s: mdt_agent_llog_update_rec() failed, rc = %d\n",
mdt_obd_name(ducb->mdt), rc);
- if (found == 1)
- RETURN(LLOG_DEL_RECORD);
-
RETURN(rc);
}
RETURN(rc);
}
-/**
- * update a llog record
- * cdt_llog_lock must be hold
- * \param env [IN] environment
- * \param mdt [IN] mdt device
- * \param llh [IN] llog handle, must be a catalog handle
- * \param larr [IN] record
- * \retval 0 success
- * \retval -ve failure
- */
-int mdt_agent_llog_update_rec(const struct lu_env *env,
- struct mdt_device *mdt, struct llog_handle *llh,
- struct llog_agent_req_rec *larr)
-{
- struct llog_rec_hdr saved_hdr;
- int rc;
- ENTRY;
-
- /* saved old record info */
- saved_hdr = larr->arr_hdr;
- /* add new record with updated values */
- larr->arr_hdr.lrh_id = 0;
- larr->arr_hdr.lrh_index = 0;
- rc = llog_cat_add(env, llh->u.phd.phd_cat_handle, &larr->arr_hdr,
- NULL);
- larr->arr_hdr = saved_hdr;
- RETURN(rc);
-}
-
/*
* Agent actions /proc seq_file methods
* As llog processing uses a callback for each entry, we cannot do a sequential
RETURN(ERR_PTR(-ENOENT));
}
- CDEBUG(D_HSM, "llog succesfully initialized, start from "LPD64"\n",
+ CDEBUG(D_HSM, "llog successfully initialized, start from %lld\n",
*pos);
/* first call = rewind */
if (*pos == 0) {
aai->aai_cat_index = 0;
- aai->aai_index = -1;
+ aai->aai_index = 0;
aai->aai_eof = false;
*pos = 1;
}
struct llog_agent_req_rec *larr = (struct llog_agent_req_rec *)hdr;
struct seq_file *s = data;
struct agent_action_iterator *aai;
- int rc, sz;
- size_t count;
+ int sz;
char buf[12];
ENTRY;
hdr->lrh_index <= aai->aai_index))
RETURN(0);
- count = s->count;
sz = larr->arr_hai.hai_len - sizeof(larr->arr_hai);
- rc = seq_printf(s, "lrh=[type=%X len=%d idx=%d/%d] fid="DFID
- " dfid="DFID
- " compound/cookie="LPX64"/"LPX64
- " action=%s archive#=%d flags="LPX64
- " extent="LPX64"-"LPX64
- " gid="LPX64" datalen=%d status=%s"
- " data=[%s]\n",
- hdr->lrh_type, hdr->lrh_len,
- llh->lgh_hdr->llh_cat_idx, hdr->lrh_index,
- PFID(&larr->arr_hai.hai_fid),
- PFID(&larr->arr_hai.hai_dfid),
- larr->arr_compound_id, larr->arr_hai.hai_cookie,
- hsm_copytool_action2name(larr->arr_hai.hai_action),
- larr->arr_archive_id,
- larr->arr_flags,
- larr->arr_hai.hai_extent.offset,
- larr->arr_hai.hai_extent.length,
- larr->arr_hai.hai_gid, sz,
- agent_req_status2name(larr->arr_status),
- hai_dump_data_field(&larr->arr_hai, buf, sizeof(buf)));
- if (rc == 0) {
- aai->aai_cat_index = llh->lgh_hdr->llh_cat_idx;
- aai->aai_index = hdr->lrh_index;
- } else {
- if (s->count == s->size && count > 0) /* rewind the buffer */
- s->count = count;
- rc = LLOG_PROC_BREAK;
- }
- RETURN(rc);
+ seq_printf(s, "lrh=[type=%X len=%d idx=%d/%d] fid="DFID
+ " dfid="DFID" compound/cookie=%#llx/%#llx"
+ " action=%s archive#=%d flags=%#llx"
+ " extent=%#llx-%#llx"
+ " gid=%#llx datalen=%d status=%s data=[%s]\n",
+ hdr->lrh_type, hdr->lrh_len,
+ llh->lgh_hdr->llh_cat_idx, hdr->lrh_index,
+ PFID(&larr->arr_hai.hai_fid),
+ PFID(&larr->arr_hai.hai_dfid),
+ larr->arr_compound_id, larr->arr_hai.hai_cookie,
+ hsm_copytool_action2name(larr->arr_hai.hai_action),
+ larr->arr_archive_id,
+ larr->arr_flags,
+ larr->arr_hai.hai_extent.offset,
+ larr->arr_hai.hai_extent.length,
+ larr->arr_hai.hai_gid, sz,
+ agent_req_status2name(larr->arr_status),
+ hai_dump_data_field(&larr->arr_hai, buf, sizeof(buf)));
+
+ aai->aai_cat_index = llh->lgh_hdr->llh_cat_idx;
+ aai->aai_index = hdr->lrh_index;
+
+ RETURN(0);
}
/**
mutex_lock(&cdt->cdt_llog_lock);
rc = llog_cat_process(&aai->aai_env, aai->aai_ctxt->loc_handle,
hsm_actions_show_cb, s,
- aai->aai_cat_index, aai->aai_index + 1);
+ aai->aai_cat_index, aai->aai_index);
mutex_unlock(&cdt->cdt_llog_lock);
if (rc == 0) /* all llog parsed */
aai->aai_eof = true;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff