#include "ofd_internal.h"
#include <obd_cksum.h>
-#include <lquota.h>
+#include <lustre_quota.h>
static int ofd_export_stats_init(struct ofd_device *ofd,
struct obd_export *exp, void *client_nid)
lsd->lsd_feature_compat |= OBD_COMPAT_OST;
/* sync is not needed here as lut_client_add will
* set exp_need_sync flag */
- lut_server_data_update(env, &ofd->ofd_lut, 0);
+ tgt_server_data_update(env, &ofd->ofd_lut, 0);
} else if (index != data->ocd_index) {
LCONSOLE_ERROR_MSG(0x136, "Connection from %s to index"
" %u doesn't match actual OST index"
memcpy(ted->ted_lcd->lcd_uuid, cluuid,
sizeof(ted->ted_lcd->lcd_uuid));
- rc = lut_client_new(env, exp);
+ rc = tgt_client_new(env, exp);
if (rc != 0)
GOTO(out, rc);
ofd_export_stats_init(ofd, exp, localdata);
/* Do not erase record for recoverable client. */
if (exp->exp_obd->obd_replayable &&
(!exp->exp_obd->obd_fail || exp->exp_failed))
- lut_client_del(&env, exp);
+ tgt_client_del(&env, exp);
lu_env_fini(&env);
class_export_put(exp);
&exp->exp_client_uuid)))
return 0;
- rc = lut_client_alloc(exp);
+ rc = tgt_client_alloc(exp);
if (rc == 0)
ldlm_init_export(exp);
if (rc)
return 0;
ldlm_destroy_export(exp);
- lut_client_free(exp);
+ tgt_client_free(exp);
ofd_fmd_cleanup(exp);
return 0;
}
+int ofd_postrecov(const struct lu_env *env, struct ofd_device *ofd)
+{
+ struct lu_device *ldev = &ofd->ofd_dt_dev.dd_lu_dev;
+
+ CDEBUG(D_HA, "%s: recovery is over\n", ofd_obd(ofd)->obd_name);
+ return ldev->ld_ops->ldo_recovery_complete(env, ldev);
+}
+
int ofd_obd_postrecov(struct obd_device *obd)
{
struct lu_env env;
RETURN(rc);
ofd_info_init(&env, obd->obd_self_export);
- rc = ldev->ld_ops->ldo_recovery_complete(&env, ldev);
+ rc = ofd_postrecov(&env, ofd_dev(ldev));
+
lu_env_fini(&env);
RETURN(rc);
}
osfs->os_blocks, osfs->os_bfree, osfs->os_bavail,
osfs->os_files, osfs->os_ffree, osfs->os_state);
- if (OBD_FAIL_CHECK_VALUE(OBD_FAIL_OST_ENOSPC,
- ofd->ofd_lut.lut_lsd.lsd_ost_index))
- osfs->os_bfree = osfs->os_bavail = 2;
-
if (OBD_FAIL_CHECK_VALUE(OBD_FAIL_OST_ENOINO,
ofd->ofd_lut.lut_lsd.lsd_ost_index))
osfs->os_ffree = 0;
osfs->os_bsize = 1 << COMPAT_BSIZE_SHIFT;
}
+ if (OBD_FAIL_CHECK_VALUE(OBD_FAIL_OST_ENOSPC,
+ ofd->ofd_lut.lut_lsd.lsd_ost_index))
+ osfs->os_bfree = osfs->os_bavail = 2;
+
EXIT;
out:
return rc;
{
struct ofd_thread_info *info = ofd_info(env);
struct lustre_handle lockh;
- int flags = LDLM_AST_DISCARD_DATA, rc = 0;
+ __u64 flags = LDLM_AST_DISCARD_DATA, rc = 0;
ldlm_policy_data_t policy = {
.l_extent = { 0, OBD_OBJECT_EOF }
};
ENTRY;
+ fo = ofd_object_find(env, ofd, fid);
+ if (IS_ERR(fo))
+ RETURN(PTR_ERR(fo));
+
/* Tell the clients that the object is gone now and that they should
* throw away any cached pages. */
ofd_build_resid(fid, &info->fti_resid);
if (rc == ELDLM_OK)
ldlm_lock_decref(&lockh, LCK_PW);
- fo = ofd_object_find(env, ofd, fid);
- if (IS_ERR(fo))
- RETURN(PTR_ERR(fo));
LASSERT(fo != NULL);
rc = ofd_object_destroy(env, fo, orphan);
lrc = ofd_destroy_by_fid(env, ofd, &info->fti_fid, 0);
if (lrc == -ENOENT) {
CDEBUG(D_INODE,
- "destroying non-existent object "LPU64"\n",
- oa->o_id);
+ "%s: destroying non-existent object "DFID"\n",
+ ofd_obd(ofd)->obd_name, PFID(&info->fti_fid));
/* rewrite rc with -ENOENT only if it is 0 */
if (rc == 0)
rc = lrc;
} else if (lrc != 0) {
- CEMERG("error destroying object "LPU64": %d\n",
- oa->o_id, rc);
+ CERROR("%s: error destroying object "DFID": %d\n",
+ ofd_obd(ofd)->obd_name, PFID(&info->fti_fid),
+ rc);
rc = lrc;
}
count--;
}
}
if (diff > 0) {
- obd_id next_id = ofd_last_id(ofd, oa->o_seq) + 1;
- int i;
+ cfs_time_t enough_time = cfs_time_shift(DISK_TIMEOUT);
+ obd_id next_id;
+ int created = 0;
+ int count;
if (!(oa->o_valid & OBD_MD_FLFLAGS) ||
!(oa->o_flags & OBD_FL_DELORPHAN)) {
}
}
- CDEBUG(D_HA,
- "%s: reserve %d objects in group "LPU64" at "LPU64"\n",
- ofd_obd(ofd)->obd_name, diff, oa->o_seq, next_id);
- for (i = 0; i < diff; i++) {
- rc = ofd_precreate_object(env, ofd, next_id + i,
- oa->o_seq);
- if (rc)
+ while (diff > 0) {
+ next_id = ofd_last_id(ofd, oa->o_seq) + 1;
+ count = ofd_precreate_batch(ofd, diff);
+
+ CDEBUG(D_HA, "%s: reserve %d objects in group "LPU64
+ " at "LPU64"\n", ofd_obd(ofd)->obd_name,
+ count, oa->o_seq, next_id);
+
+ if (cfs_time_after(jiffies, enough_time)) {
+ LCONSOLE_WARN("%s: Slow creates, %d/%d objects"
+ " created at a rate of %d/s\n",
+ ofd_obd(ofd)->obd_name,
+ created, diff + created,
+ created / DISK_TIMEOUT);
+ break;
+ }
+
+ rc = ofd_precreate_objects(env, ofd, next_id,
+ oa->o_seq, count);
+ if (rc > 0) {
+ created += rc;
+ diff -= rc;
+ } else if (rc < 0) {
break;
+ }
}
- if (i > 0) {
+ if (created > 0) {
/* some objects got created, we can return
* them, even if last creation failed */
oa->o_id = ofd_last_id(ofd, oa->o_seq);
GOTO(out, rc = PTR_ERR(fo));
}
- ofd_write_lock(env, fo);
if (!ofd_object_exists(fo))
- GOTO(unlock, rc = -ENOENT);
+ GOTO(put, rc = -ENOENT);
if (dt_version_get(env, ofd_object_child(fo)) >
ofd_obd(ofd)->obd_last_committed) {
rc = dt_object_sync(env, ofd_object_child(fo));
if (rc)
- GOTO(unlock, rc);
+ GOTO(put, rc);
}
oinfo->oi_oa->o_valid = OBD_MD_FLID;
ofd_counter_incr(exp, LPROC_OFD_STATS_SYNC, oinfo->oi_jobid, 1);
EXIT;
-unlock:
- ofd_write_unlock(env, fo);
+put:
ofd_object_put(env, fo);
out:
return rc;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff