* GPL HEADER END
*/
/*
- * Copyright (c) 2013, Intel Corporation.
+ * Copyright (c) 2013, 2014, Intel Corporation.
*/
/*
* lustre/osp/osp_md_object.c
static const char dotdot[] = "..";
/**
+ * Interpreter call for object creation
+ *
+ * Object creation interpreter, which will be called after creating
+ * the remote object to set flags and status.
+ *
+ * \param[in] env execution environment
+ * \param[in] reply update reply
+ * \param[in] req ptlrpc update request for creating object
+ * \param[in] obj object to be created
+ * \param[in] data data used in this function.
+ * \param[in] index index(position) of create update in the whole
+ * updates
+ * \param[in] rc update result on the remote MDT.
+ *
+ * \retval only return 0 for now
+ */
+static int osp_object_create_interpreter(const struct lu_env *env,
+ struct object_update_reply *reply,
+ struct ptlrpc_request *req,
+ struct osp_object *obj,
+ void *data, int index, int rc)
+{
+ if (rc != 0) {
+ obj->opo_obj.do_lu.lo_header->loh_attr &= ~LOHA_EXISTS;
+ obj->opo_non_exist = 1;
+ }
+ return 0;
+}
+
+/**
* Implementation of dt_object_operations::do_declare_create
*
- * Insert object create update into the RPC, which will be sent during
- * transaction start. Note: if the object has already been created,
- * we must add object destroy updates ahead of create updates, so it will
- * destroy then recreate the object.
+ * Create the dt_update_request to track the update for this OSP
+ * in the transaction.
*
* \param[in] env execution environment
* \param[in] dt remote object to be created
* \param[in] dof creation format information
* \param[in] th the transaction handle
*
- * \retval 0 if the insertion succeeds.
- * \retval negative errno if the insertion fails.
+ * \retval 0 if preparation succeeds.
+ * \retval negative errno if preparation fails.
*/
int osp_md_declare_object_create(const struct lu_env *env,
struct dt_object *dt,
struct dt_object_format *dof,
struct thandle *th)
{
- struct dt_update_request *update;
- int rc;
-
- update = dt_update_request_find_or_create(th, dt);
- if (IS_ERR(update)) {
- CERROR("%s: Get OSP update buf failed: rc = %d\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- (int)PTR_ERR(update));
- return PTR_ERR(update);
- }
-
- if (lu_object_exists(&dt->do_lu)) {
- /* If the object already exists, we needs to destroy
- * this orphan object first.
- *
- * The scenario might happen in this case
- *
- * 1. client send remote create to MDT0.
- * 2. MDT0 send create update to MDT1.
- * 3. MDT1 finished create synchronously.
- * 4. MDT0 failed and reboot.
- * 5. client resend remote create to MDT0.
- * 6. MDT0 tries to resend create update to MDT1,
- * but find the object already exists
- */
- CDEBUG(D_HA, "%s: object "DFID" exists, destroy this orphan\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- PFID(lu_object_fid(&dt->do_lu)));
-
- rc = out_ref_del_pack(env, &update->dur_buf,
- lu_object_fid(&dt->do_lu),
- update->dur_batchid);
- if (rc != 0)
- GOTO(out, rc);
-
- if (S_ISDIR(lu_object_attr(&dt->do_lu))) {
- /* decrease for ".." */
- rc = out_ref_del_pack(env, &update->dur_buf,
- lu_object_fid(&dt->do_lu),
- update->dur_batchid);
- if (rc != 0)
- GOTO(out, rc);
- }
-
- rc = out_object_destroy_pack(env, &update->dur_buf,
- lu_object_fid(&dt->do_lu),
- update->dur_batchid);
- if (rc != 0)
- GOTO(out, rc);
-
- dt->do_lu.lo_header->loh_attr &= ~LOHA_EXISTS;
- /* Increase batchid to add this orphan object deletion
- * to separate transaction */
- update_inc_batchid(update);
- }
-
- rc = out_create_pack(env, &update->dur_buf,
- lu_object_fid(&dt->do_lu), attr, hint, dof,
- update->dur_batchid);
- if (rc != 0)
- GOTO(out, rc);
-out:
- if (rc)
- CERROR("%s: Insert update error: rc = %d\n",
- dt->do_lu.lo_dev->ld_obd->obd_name, rc);
-
- return rc;
+ return osp_trans_update_request_create(th);
}
/**
* Implementation of dt_object_operations::do_create
*
- * It sets necessary flags for created object. In DNE phase I,
- * remote updates are actually executed during transaction start,
- * i.e. the object has already been created when calling this method.
+ * It adds an OUT_CREATE sub-request into the OUT RPC that will be flushed
+ * when the transaction stop, and sets necessary flags for created object.
*
* \param[in] env execution environment
* \param[in] dt object to be created
* \param[in] dof creation format information
* \param[in] th the transaction handle
*
- * \retval only return 0 for now
+ * \retval 0 if packing creation succeeds.
+ * \retval negative errno if packing creation fails.
*/
int osp_md_object_create(const struct lu_env *env, struct dt_object *dt,
struct lu_attr *attr, struct dt_allocation_hint *hint,
struct dt_object_format *dof, struct thandle *th)
{
- CDEBUG(D_INFO, "create object "DFID"\n",
- PFID(&dt->do_lu.lo_header->loh_fid));
+ struct dt_update_request *update;
+ int rc;
+
+ update = thandle_to_dt_update_request(th);
+ LASSERT(update != NULL);
+
+ rc = out_create_pack(env, &update->dur_buf,
+ lu_object_fid(&dt->do_lu), attr, hint, dof,
+ update->dur_batchid);
+ if (rc != 0)
+ GOTO(out, rc);
+
+ rc = osp_insert_update_callback(env, update, dt2osp_obj(dt), attr,
+ osp_object_create_interpreter);
+
+ if (rc < 0)
+ GOTO(out, rc);
- /* Because the create update RPC will be sent during declare phase,
- * if creation reaches here, it means the object has been created
- * successfully */
dt->do_lu.lo_header->loh_attr |= LOHA_EXISTS | (attr->la_mode & S_IFMT);
dt2osp_obj(dt)->opo_non_exist = 0;
-
- return 0;
+out:
+ return rc;
}
/**
* Implementation of dt_object_operations::do_declare_ref_del
*
- * Declare decreasing the reference count of the remote object, i.e. insert
- * decreasing object reference count update into the RPC, which will be sent
- * during transaction start.
+ * Create the dt_update_request to track the update for this OSP
+ * in the transaction.
*
* \param[in] env execution environment
* \param[in] dt object to decrease the reference count.
* \param[in] th the transaction handle of refcount decrease.
*
- * \retval 0 if the insertion succeeds.
- * \retval negative errno if the insertion fails.
+ * \retval 0 if preparation succeeds.
+ * \retval negative errno if preparation fails.
*/
-static int osp_md_declare_object_ref_del(const struct lu_env *env,
- struct dt_object *dt,
- struct thandle *th)
+static int osp_md_declare_ref_del(const struct lu_env *env,
+ struct dt_object *dt, struct thandle *th)
{
- struct dt_update_request *update;
- int rc;
-
- update = dt_update_request_find_or_create(th, dt);
- if (IS_ERR(update)) {
- CERROR("%s: Get OSP update buf failed: rc = %d\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- (int)PTR_ERR(update));
- return PTR_ERR(update);
- }
-
- rc = out_ref_del_pack(env, &update->dur_buf,
- lu_object_fid(&dt->do_lu),
- update->dur_batchid);
- return rc;
+ return osp_trans_update_request_create(th);
}
/**
* Implementation of dt_object_operations::do_ref_del
*
- * Do nothing in this method for now. In DNE phase I, remote updates are
- * actually executed during transaction start, i.e. the object reference
- * count has already been decreased when calling this method.
+ * Add an OUT_REF_DEL sub-request into the OUT RPC that will be
+ * flushed when the transaction stop.
*
* \param[in] env execution environment
* \param[in] dt object to decrease the reference count
* \param[in] th the transaction handle
*
- * \retval only return 0 for now
+ * \retval 0 if packing ref_del succeeds.
+ * \retval negative errno if packing fails.
*/
-static int osp_md_object_ref_del(const struct lu_env *env,
- struct dt_object *dt,
- struct thandle *th)
+static int osp_md_ref_del(const struct lu_env *env, struct dt_object *dt,
+ struct thandle *th)
{
- CDEBUG(D_INFO, "ref del object "DFID"\n",
- PFID(&dt->do_lu.lo_header->loh_fid));
+ struct dt_update_request *update;
+ int rc;
- return 0;
+ update = thandle_to_dt_update_request(th);
+ LASSERT(update != NULL);
+
+ rc = out_ref_del_pack(env, &update->dur_buf,
+ lu_object_fid(&dt->do_lu),
+ update->dur_batchid);
+ return rc;
}
/**
* Implementation of dt_object_operations::do_declare_ref_del
*
- * Declare increasing the reference count of the remote object,
- * i.e. insert increasing object reference count update into RPC.
+ * Create the dt_update_request to track the update for this OSP
+ * in the transaction.
*
* \param[in] env execution environment
* \param[in] dt object on which to increase the reference count.
* \param[in] th the transaction handle.
*
- * \retval 0 if the insertion succeeds.
- * \retval negative errno if the insertion fails.
+ * \retval 0 if preparation succeeds.
+ * \retval negative errno if preparation fails.
*/
static int osp_md_declare_ref_add(const struct lu_env *env,
struct dt_object *dt, struct thandle *th)
{
- struct dt_update_request *update;
- int rc;
-
- update = dt_update_request_find_or_create(th, dt);
- if (IS_ERR(update)) {
- CERROR("%s: Get OSP update buf failed: rc = %d\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- (int)PTR_ERR(update));
- return PTR_ERR(update);
- }
-
- rc = out_ref_add_pack(env, &update->dur_buf,
- lu_object_fid(&dt->do_lu),
- update->dur_batchid);
-
- return rc;
+ return osp_trans_update_request_create(th);
}
/**
* Implementation of dt_object_operations::do_ref_add
*
- * Do nothing in this method for now. In DNE phase I, remote updates are
- * actually executed during transaction start, i.e. the object reference
- * count has already been increased when calling this method.
+ * Add an OUT_REF_ADD sub-request into the OUT RPC that will be flushed
+ * when the transaction stop.
*
* \param[in] env execution environment
* \param[in] dt object on which to increase the reference count
* \param[in] th the transaction handle
*
- * \retval only return 0 for now
+ * \retval 0 if packing ref_add succeeds.
+ * \retval negative errno if packing fails.
*/
-static int osp_md_object_ref_add(const struct lu_env *env, struct dt_object *dt,
- struct thandle *th)
+static int osp_md_ref_add(const struct lu_env *env, struct dt_object *dt,
+ struct thandle *th)
{
- CDEBUG(D_INFO, "ref add object "DFID"\n",
- PFID(&dt->do_lu.lo_header->loh_fid));
+ struct dt_update_request *update;
+ int rc;
- return 0;
+ update = thandle_to_dt_update_request(th);
+ LASSERT(update != NULL);
+
+ rc = out_ref_add_pack(env, &update->dur_buf,
+ lu_object_fid(&dt->do_lu),
+ update->dur_batchid);
+ return rc;
}
/**
/**
* Implementation of dt_object_operations::do_declare_attr_get
*
- * Declare setting attributes of the remote object, i.e. insert remote
- * object attr_set update into RPC.
+ * Create the dt_update_request to track the update for this OSP
+ * in the transaction.
*
* \param[in] env execution environment
* \param[in] dt object on which to set attributes
* \param[in] attr attributes to be set
* \param[in] th the transaction handle
*
- * \retval 0 if the insertion succeeds.
- * \retval negative errno if the insertion fails.
+ * \retval 0 if preparation succeeds.
+ * \retval negative errno if preparation fails.
*/
int osp_md_declare_attr_set(const struct lu_env *env, struct dt_object *dt,
const struct lu_attr *attr, struct thandle *th)
{
- struct dt_update_request *update;
- int rc;
-
- update = dt_update_request_find_or_create(th, dt);
- if (IS_ERR(update)) {
- CERROR("%s: Get OSP update buf failed: %d\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- (int)PTR_ERR(update));
- return PTR_ERR(update);
- }
-
- rc = out_attr_set_pack(env, &update->dur_buf,
- lu_object_fid(&dt->do_lu), attr,
- update->dur_batchid);
-
- return rc;
+ return osp_trans_update_request_create(th);
}
/**
* Implementation of dt_object_operations::do_attr_set
*
- * Do nothing in this method for now. In DNE phase I, remote updates
- * are actually executed during transaction start, i.e. object attributes
- * have already been set when calling this method.
+ * Set attributes to the specified remote object.
+ *
+ * Add the OUT_ATTR_SET sub-request into the OUT RPC that will be flushed
+ * when the transaction stop.
*
* \param[in] env execution environment
* \param[in] dt object to set attributes
* \param[in] attr attributes to be set
* \param[in] th the transaction handle
- * \param[in] capa capability of setting attributes (not yet implemented).
*
- * \retval only return 0 for now
+ * \retval 0 if packing attr_set succeeds.
+ * \retval negative errno if packing fails.
*/
int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
- const struct lu_attr *attr, struct thandle *th,
- struct lustre_capa *capa)
+ const struct lu_attr *attr, struct thandle *th)
{
- CDEBUG(D_INFO, "attr set object "DFID"\n",
- PFID(&dt->do_lu.lo_header->loh_fid));
+ struct dt_update_request *update;
+ int rc;
+
+ update = thandle_to_dt_update_request(th);
+ LASSERT(update != NULL);
- RETURN(0);
+ rc = out_attr_set_pack(env, &update->dur_buf,
+ lu_object_fid(&dt->do_lu), attr,
+ update->dur_batchid);
+
+ return rc;
}
/**
* \param[in] dt index object to lookup
* \param[out] rec record in which to return lookup result
* \param[in] key key of index which will be looked up
- * \param[in] capa capability of lookup (not yet implemented)
*
* \retval 1 if the lookup succeeds.
* \retval negative errno if the lookup fails.
*/
static int osp_md_index_lookup(const struct lu_env *env, struct dt_object *dt,
- struct dt_rec *rec, const struct dt_key *key,
- struct lustre_capa *capa)
+ struct dt_rec *rec, const struct dt_key *key)
{
struct lu_buf *lbuf = &osp_env_info(env)->osi_lb2;
struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
GOTO(out, rc);
}
- rc = out_remote_sync(env, osp->opd_obd->u.cli.cl_import, update, &req);
+ rc = osp_remote_sync(env, osp, update, &req);
if (rc < 0)
GOTO(out, rc);
/**
* Implementation of dt_index_operations::dio_declare_insert
*
- * Declare the index insert of the remote object, i.e. pack index insert update
- * into the RPC, which will be sent during transaction start.
+ * Create the dt_update_request to track the update for this OSP
+ * in the transaction.
*
* \param[in] env execution environment
* \param[in] dt object for which to insert index
* \param[in] key key of the index which will be inserted
* \param[in] th the transaction handle
*
- * \retval 0 if the insertion succeeds.
- * \retval negative errno if the insertion fails.
+ * \retval 0 if preparation succeeds.
+ * \retval negative errno if preparation fails.
*/
-static int osp_md_declare_insert(const struct lu_env *env,
- struct dt_object *dt,
- const struct dt_rec *rec,
- const struct dt_key *key,
- struct thandle *th)
+static int osp_md_declare_index_insert(const struct lu_env *env,
+ struct dt_object *dt,
+ const struct dt_rec *rec,
+ const struct dt_key *key,
+ struct thandle *th)
{
- struct dt_update_request *update;
- int rc;
-
- update = dt_update_request_find_or_create(th, dt);
- if (IS_ERR(update)) {
- CERROR("%s: Get OSP update buf failed: rc = %d\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- (int)PTR_ERR(update));
- return PTR_ERR(update);
- }
-
- rc = out_index_insert_pack(env, &update->dur_buf,
- lu_object_fid(&dt->do_lu), rec, key,
- update->dur_batchid);
- return rc;
+ return osp_trans_update_request_create(th);
}
/**
* Implementation of dt_index_operations::dio_insert
*
- * Do nothing in this method for now. In DNE phase I, remote updates
- * are actually executed during transaction start, i.e. the index has
- * already been inserted when calling this method.
+ * Add an OUT_INDEX_INSERT sub-request into the OUT RPC that will
+ * be flushed when the transaction stop.
*
* \param[in] env execution environment
* \param[in] dt object for which to insert index
* \param[in] rec record of the index to be inserted
* \param[in] key key of the index to be inserted
* \param[in] th the transaction handle
- * \param[in] capa capability of insert (not yet implemented)
* \param[in] ignore_quota quota enforcement for insert
*
- * \retval only return 0 for now
+ * \retval 0 if packing index insert succeeds.
+ * \retval negative errno if packing fails.
*/
static int osp_md_index_insert(const struct lu_env *env,
struct dt_object *dt,
const struct dt_rec *rec,
const struct dt_key *key,
struct thandle *th,
- struct lustre_capa *capa,
int ignore_quota)
{
- return 0;
+ struct osp_thandle *oth = thandle_to_osp_thandle(th);
+ struct dt_update_request *update = oth->ot_dur;
+ int rc;
+
+
+ rc = out_index_insert_pack(env, &update->dur_buf,
+ lu_object_fid(&dt->do_lu), rec, key,
+ update->dur_batchid);
+
+ return rc;
}
/**
* Implementation of dt_index_operations::dio_declare_delete
*
- * Declare the index delete of the remote object, i.e. insert index delete
- * update into the RPC, which will be sent during transaction start.
+ * Create the dt_update_request to track the update for this OSP
+ * in the transaction.
*
* \param[in] env execution environment
* \param[in] dt object for which to delete index
* \param[in] key key of the index
* \param[in] th the transaction handle
*
- * \retval 0 if the insertion succeeds.
- * \retval negative errno if the insertion fails.
+ * \retval 0 if preparation succeeds.
+ * \retval negative errno if preparation fails.
*/
-static int osp_md_declare_delete(const struct lu_env *env,
- struct dt_object *dt,
- const struct dt_key *key,
- struct thandle *th)
+static int osp_md_declare_index_delete(const struct lu_env *env,
+ struct dt_object *dt,
+ const struct dt_key *key,
+ struct thandle *th)
{
- struct dt_update_request *update;
- int rc;
-
- update = dt_update_request_find_or_create(th, dt);
- if (IS_ERR(update)) {
- CERROR("%s: Get OSP update buf failed: rc = %d\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- (int)PTR_ERR(update));
- return PTR_ERR(update);
- }
-
- rc = out_index_delete_pack(env, &update->dur_buf,
- lu_object_fid(&dt->do_lu), key,
- update->dur_batchid);
- return rc;
+ return osp_trans_update_request_create(th);
}
/**
* Implementation of dt_index_operations::dio_delete
*
- * Do nothing in this method for now. Because in DNE phase I, remote updates
- * are actually executed during transaction start, i.e. the index has already
- * been deleted when calling this method.
+ * Add an OUT_INDEX_DELETE sub-request into the OUT RPC that will
+ * be flushed when the transaction stop.
*
* \param[in] env execution environment
* \param[in] dt object for which to delete index
* \param[in] key key of the index which will be deleted
* \param[in] th the transaction handle
- * \param[in] capa capability of delete (not yet implemented)
*
- * \retval only return 0 for now
+ * \retval 0 if packing index delete succeeds.
+ * \retval negative errno if packing fails.
*/
static int osp_md_index_delete(const struct lu_env *env,
struct dt_object *dt,
const struct dt_key *key,
- struct thandle *th,
- struct lustre_capa *capa)
+ struct thandle *th)
{
- CDEBUG(D_INFO, "index delete "DFID" %s\n",
- PFID(&dt->do_lu.lo_header->loh_fid), (char *)key);
+ struct dt_update_request *update;
+ int rc;
- return 0;
+ update = thandle_to_dt_update_request(th);
+ LASSERT(update != NULL);
+
+ rc = out_index_delete_pack(env, &update->dur_buf,
+ lu_object_fid(&dt->do_lu), key,
+ update->dur_batchid);
+ return rc;
}
/**
* \retval 1 if it reaches to the end of the index object.
* \retval negative errno if the pointer cannot be advanced.
*/
-int osp_md_index_it_next(const struct lu_env *env, struct dt_it *di)
+static int osp_md_index_it_next(const struct lu_env *env, struct dt_it *di)
{
struct osp_it *it = (struct osp_it *)di;
struct lu_idxpage *idxpage;
{
struct osp_it *it = (struct osp_it *)di;
struct lu_dirent *ent = (struct lu_dirent *)it->ooi_ent;
- int reclen;
+ size_t reclen;
reclen = lu_dirent_calc_size(le16_to_cpu(ent->lde_namelen), attr);
memcpy(rec, ent, reclen);
const struct dt_index_operations osp_md_index_ops = {
.dio_lookup = osp_md_index_lookup,
- .dio_declare_insert = osp_md_declare_insert,
+ .dio_declare_insert = osp_md_declare_index_insert,
.dio_insert = osp_md_index_insert,
- .dio_declare_delete = osp_md_declare_delete,
+ .dio_declare_delete = osp_md_declare_index_delete,
.dio_delete = osp_md_index_delete,
.dio_it = {
.init = osp_it_init,
return 0;
}
+/**
+ * Implement OSP layer dt_object_operations::do_declare_destroy() interface.
+ *
+ * Create the dt_update_request to track the update for this OSP
+ * in the transaction.
+ *
+ * \param[in] env pointer to the thread context
+ * \param[in] dt pointer to the OSP layer dt_object to be destroyed
+ * \param[in] th pointer to the transaction handler
+ *
+ * \retval 0 for success
+ * \retval negative error number on failure
+ */
+int osp_md_declare_object_destroy(const struct lu_env *env,
+ struct dt_object *dt, struct thandle *th)
+{
+ return osp_trans_update_request_create(th);
+}
+
+/**
+ * Implement OSP layer dt_object_operations::do_destroy() interface.
+ *
+ * Pack the destroy update into the RPC buffer, which will be sent
+ * to the remote MDT during transaction stop.
+ *
+ * It also marks the object as non-cached.
+ *
+ * \param[in] env pointer to the thread context
+ * \param[in] dt pointer to the OSP layer dt_object to be destroyed
+ * \param[in] th pointer to the transaction handler
+ *
+ * \retval 0 for success
+ * \retval negative error number on failure
+ */
+int osp_md_object_destroy(const struct lu_env *env, struct dt_object *dt,
+ struct thandle *th)
+{
+ struct osp_object *o = dt2osp_obj(dt);
+ struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
+ struct dt_update_request *update;
+ int rc = 0;
+
+ ENTRY;
+ o->opo_non_exist = 1;
+
+ LASSERT(osp->opd_connect_mdt);
+ update = thandle_to_dt_update_request(th);
+ LASSERT(update != NULL);
+
+ rc = out_object_destroy_pack(env, &update->dur_buf,
+ lu_object_fid(&dt->do_lu), update->dur_batchid);
+ if (rc != 0)
+ RETURN(rc);
+
+ /* not needed in cache any more */
+ set_bit(LU_OBJECT_HEARD_BANSHEE, &dt->do_lu.lo_header->loh_flags);
+
+ RETURN(rc);
+}
+
struct dt_object_operations osp_md_obj_ops = {
.do_read_lock = osp_md_object_read_lock,
.do_write_lock = osp_md_object_write_lock,
.do_declare_create = osp_md_declare_object_create,
.do_create = osp_md_object_create,
.do_declare_ref_add = osp_md_declare_ref_add,
- .do_ref_add = osp_md_object_ref_add,
- .do_declare_ref_del = osp_md_declare_object_ref_del,
- .do_ref_del = osp_md_object_ref_del,
- .do_declare_destroy = osp_declare_object_destroy,
- .do_destroy = osp_object_destroy,
+ .do_ref_add = osp_md_ref_add,
+ .do_declare_ref_del = osp_md_declare_ref_del,
+ .do_ref_del = osp_md_ref_del,
+ .do_declare_destroy = osp_md_declare_object_destroy,
+ .do_destroy = osp_md_object_destroy,
.do_ah_init = osp_md_ah_init,
.do_attr_get = osp_attr_get,
.do_declare_attr_set = osp_md_declare_attr_set,
/**
* Implementation of dt_body_operations::dbo_declare_write
*
- * Declare an object write. In DNE phase I, it will pack the write
- * object update into the RPC.
- *
+ * Create the dt_update_request to track the update for this OSP
+ * in the transaction.
+ *
* \param[in] env execution environment
* \param[in] dt object to be written
* \param[in] buf buffer to write which includes an embedded size field
* \param[in] pos offet in the object to start writing at
* \param[in] th transaction handle
*
- * \retval 0 if the insertion succeeds.
- * \retval negative errno if the insertion fails.
+ * \retval 0 if preparation succeeds.
+ * \retval negative errno if preparation fails.
*/
static ssize_t osp_md_declare_write(const struct lu_env *env,
struct dt_object *dt,
const struct lu_buf *buf,
loff_t pos, struct thandle *th)
{
- struct dt_update_request *update;
- ssize_t rc;
-
- update = dt_update_request_find_or_create(th, dt);
- if (IS_ERR(update)) {
- CERROR("%s: Get OSP update buf failed: rc = %d\n",
- dt->do_lu.lo_dev->ld_obd->obd_name,
- (int)PTR_ERR(update));
- return PTR_ERR(update);
- }
-
- rc = out_write_pack(env, &update->dur_buf, lu_object_fid(&dt->do_lu),
- buf, pos, update->dur_batchid);
-
- return rc;
-
+ return osp_trans_update_request_create(th);
}
/**
* Implementation of dt_body_operations::dbo_write
*
- * Return the buffer size. In DNE phase I, remote updates
- * are actually executed during transaction start, the buffer has
- * already been written when this method is being called.
+ * Pack the write object update into the RPC buffer, which will be sent
+ * to the remote MDT during transaction stop.
*
* \param[in] env execution environment
* \param[in] dt object to be written
* \param[in] buf buffer to write which includes an embedded size field
* \param[in] pos offet in the object to start writing at
* \param[in] th transaction handle
- * \param[in] capa capability of the write (not yet implemented)
* \param[in] ignore_quota quota enforcement for this write
*
- * \retval the buffer size in bytes.
+ * \retval the buffer size in bytes if packing succeeds.
+ * \retval negative errno if packing fails.
*/
static ssize_t osp_md_write(const struct lu_env *env, struct dt_object *dt,
const struct lu_buf *buf, loff_t *pos,
- struct thandle *handle,
- struct lustre_capa *capa, int ignore_quota)
+ struct thandle *th, int ignore_quota)
{
+ struct dt_update_request *update;
+ ssize_t rc;
+
+ update = thandle_to_dt_update_request(th);
+ LASSERT(update != NULL);
+
+ rc = out_write_pack(env, &update->dur_buf, lu_object_fid(&dt->do_lu),
+ buf, *pos, update->dur_batchid);
+ if (rc < 0)
+ return rc;
+
+ /* XXX: how about the write error happened later? */
*pos += buf->lb_len;
return buf->lb_len;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff