struct lu_device_type *ldt;
struct lu_device *d;
struct ofd_thread_info *info = ofd_info(env);
+ struct lustre_mount_info *lmi;
int rc;
ENTRY;
- /* XXX: we should be able to use different OSDs here */
- type = class_get_type(LUSTRE_OSD_NAME);
+ lmi = server_get_mount_2(dev);
+ if (lmi == NULL) {
+ CERROR("Cannot get mount info for %s!\n", dev);
+ RETURN(-EFAULT);
+ }
+
+ type = class_get_type(s2lsi(lmi->lmi_sb)->lsi_osd_type);
if (!type) {
- CERROR("Unknown type: '%s'\n", LUSTRE_OSD_NAME);
+ CERROR("Unknown type: '%s'\n",
+ s2lsi(lmi->lmi_sb)->lsi_osd_type);
RETURN(-ENODEV);
}
ldt = type->typ_lu;
if (ldt == NULL) {
- CERROR("type: '%s'\n", LUSTRE_OSD_NAME);
+ CERROR("type: '%s'\n", s2lsi(lmi->lmi_sb)->lsi_osd_type);
GOTO(out_type, rc = -EINVAL);
}
ldt->ldt_obd_type = type;
d = ldt->ldt_ops->ldto_device_alloc(env, ldt, cfg);
if (IS_ERR(d)) {
- CERROR("Cannot allocate device: '%s'\n", LUSTRE_OSD_NAME);
+ CERROR("Cannot allocate device: '%s'\n",
+ s2lsi(lmi->lmi_sb)->lsi_osd_type);
GOTO(out_type, rc = -ENODEV);
}
type->typ_refcnt++;
rc = ldt->ldt_ops->ldto_device_init(env, d, dev, NULL);
if (rc) {
- CERROR("can't init device '%s', rc %d\n", LUSTRE_OSD_NAME, rc);
+ CERROR("can't init device '%s', rc = %d\n",
+ s2lsi(lmi->lmi_sb)->lsi_osd_type, rc);
GOTO(out_free, rc);
}
lu_device_get(d);
ENTRY;
+ /* Grant space for object precreation on the self export.
+ * This initial reserved space (i.e. 20MB for zfs and 560KB for ldiskfs)
+ * is enough to create 20k objects. It is then adapted based on the
+ * precreate request size (see ofd_grant_create()
+ */
+ ofd_grant_connect(env, dev->ld_obd->obd_self_export,
+ OST_MAX_PRECREATE * ofd->ofd_dt_conf.ddp_inodespace);
rc = next->ld_ops->ldo_recovery_complete(env, next);
RETURN(rc);
}
.ldo_recovery_complete = ofd_recovery_complete,
};
+static int ofd_procfs_init(struct ofd_device *ofd)
+{
+ struct lprocfs_static_vars lvars;
+ struct obd_device *obd = ofd_obd(ofd);
+ cfs_proc_dir_entry_t *entry;
+ int rc = 0;
+
+ ENTRY;
+
+ /* lprocfs must be setup before the ofd so state can be safely added
+ * to /proc incrementally as the ofd is setup */
+ lprocfs_ofd_init_vars(&lvars);
+ rc = lprocfs_obd_setup(obd, lvars.obd_vars);
+ if (rc) {
+ CERROR("%s: lprocfs_obd_setup failed: %d.\n",
+ obd->obd_name, rc);
+ RETURN(rc);
+ }
+
+ rc = lprocfs_alloc_obd_stats(obd, LPROC_OFD_LAST);
+ if (rc) {
+ CERROR("%s: lprocfs_alloc_obd_stats failed: %d.\n",
+ obd->obd_name, rc);
+ GOTO(obd_cleanup, rc);
+ }
+
+ /* Init OFD private stats here */
+ lprocfs_counter_init(obd->obd_stats, LPROC_OFD_READ_BYTES,
+ LPROCFS_CNTR_AVGMINMAX, "read_bytes", "bytes");
+ lprocfs_counter_init(obd->obd_stats, LPROC_OFD_WRITE_BYTES,
+ LPROCFS_CNTR_AVGMINMAX, "write_bytes", "bytes");
+
+ rc = lproc_ofd_attach_seqstat(obd);
+ if (rc) {
+ CERROR("%s: create seqstat failed: %d.\n", obd->obd_name, rc);
+ GOTO(free_obd_stats, rc);
+ }
+
+ entry = lprocfs_register("exports", obd->obd_proc_entry, NULL, NULL);
+ if (IS_ERR(entry)) {
+ rc = PTR_ERR(entry);
+ CERROR("%s: error %d setting up lprocfs for %s\n",
+ obd->obd_name, rc, "exports");
+ GOTO(free_obd_stats, rc);
+ }
+ obd->obd_proc_exports_entry = entry;
+
+ entry = lprocfs_add_simple(obd->obd_proc_exports_entry, "clear",
+ lprocfs_nid_stats_clear_read,
+ lprocfs_nid_stats_clear_write, obd, NULL);
+ if (IS_ERR(entry)) {
+ rc = PTR_ERR(entry);
+ CERROR("%s: add proc entry 'clear' failed: %d.\n",
+ obd->obd_name, rc);
+ GOTO(free_obd_stats, rc);
+ }
+ RETURN(0);
+
+free_obd_stats:
+ lprocfs_free_obd_stats(obd);
+obd_cleanup:
+ lprocfs_obd_cleanup(obd);
+ return rc;
+}
+
+static int ofd_procfs_fini(struct ofd_device *ofd)
+{
+ struct obd_device *obd = ofd_obd(ofd);
+
+ lprocfs_remove_proc_entry("clear", obd->obd_proc_exports_entry);
+ lprocfs_free_per_client_stats(obd);
+ lprocfs_free_obd_stats(obd);
+ lprocfs_obd_cleanup(obd);
+ return 0;
+}
+
extern int ost_handle(struct ptlrpc_request *req);
static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
const char *dev = lustre_cfg_string(cfg, 0);
struct ofd_thread_info *info = NULL;
struct obd_device *obd;
+ struct obd_statfs *osfs;
int rc;
ENTRY;
obd->u.obt.obt_magic = OBT_MAGIC;
+ m->ofd_fmd_max_num = OFD_FMD_MAX_NUM_DEFAULT;
+ m->ofd_fmd_max_age = OFD_FMD_MAX_AGE_DEFAULT;
+
+ cfs_spin_lock_init(&m->ofd_flags_lock);
+ m->ofd_raid_degraded = 0;
+ m->ofd_syncjournal = 0;
+ ofd_slc_set(m);
+ m->ofd_grant_compat_disable = 0;
+
+ /* statfs data */
+ cfs_spin_lock_init(&m->ofd_osfs_lock);
+ m->ofd_osfs_age = cfs_time_shift_64(-1000);
+ m->ofd_osfs_unstable = 0;
+ m->ofd_statfs_inflight = 0;
+ m->ofd_osfs_inflight = 0;
+
+ /* grant data */
+ cfs_spin_lock_init(&m->ofd_grant_lock);
+ m->ofd_tot_dirty = 0;
+ m->ofd_tot_granted = 0;
+ m->ofd_tot_pending = 0;
+ m->ofd_max_group = 0;
+
cfs_rwlock_init(&obd->u.filter.fo_sptlrpc_lock);
sptlrpc_rule_set_init(&obd->u.filter.fo_sptlrpc_rset);
/* set this lu_device to obd, because error handling need it */
obd->obd_lu_dev = &m->ofd_dt_dev.dd_lu_dev;
+ rc = ofd_procfs_init(m);
+ if (rc) {
+ CERROR("Can't init ofd lprocfs, rc %d\n", rc);
+ RETURN(rc);
+ }
+
/* No connection accepted until configurations will finish */
obd->obd_no_conn = 1;
obd->obd_replayable = 1;
rc = lu_site_init(&m->ofd_site, &m->ofd_dt_dev.dd_lu_dev);
if (rc)
- GOTO(err_out, rc);
+ GOTO(err_fini_proc, rc);
m->ofd_site.ls_top_dev = &m->ofd_dt_dev.dd_lu_dev;
rc = ofd_stack_init(env, m, cfg);
GOTO(err_lu_site, rc);
}
+ /* populate cached statfs data */
+ osfs = &ofd_info(env)->fti_u.osfs;
+ rc = ofd_statfs_internal(env, m, osfs, 0, NULL);
+ if (rc != 0) {
+ CERROR("%s: can't get statfs data, rc %d\n", obd->obd_name, rc);
+ GOTO(err_fini_stack, rc);
+ }
+ if (!IS_PO2(osfs->os_bsize)) {
+ CERROR("%s: blocksize (%d) is not a power of 2\n",
+ obd->obd_name, osfs->os_bsize);
+ GOTO(err_fini_stack, rc = -EPROTO);
+ }
+ m->ofd_blockbits = cfs_fls(osfs->os_bsize) - 1;
+
+ snprintf(info->fti_u.name, sizeof(info->fti_u.name), "filter-%p", m);
m->ofd_namespace = ldlm_namespace_new(obd, info->fti_u.name,
LDLM_NAMESPACE_SERVER,
LDLM_NAMESPACE_GREEDY,
GOTO(err_fini_stack, rc = -ENOMEM);
/* set obd_namespace for compatibility with old code */
obd->obd_namespace = m->ofd_namespace;
+ ldlm_register_intent(m->ofd_namespace, ofd_intent_policy);
+ m->ofd_namespace->ns_lvbo = &ofd_lvbo;
+ m->ofd_namespace->ns_lvbp = m;
+
+ ptlrpc_init_client(LDLM_CB_REQUEST_PORTAL, LDLM_CB_REPLY_PORTAL,
+ "filter_ldlm_cb_client", &obd->obd_ldlm_client);
dt_conf_get(env, m->ofd_osd, &m->ofd_dt_conf);
+ /* Allow at most ddp_grant_reserved% of the available filesystem space
+ * to be granted to clients, so that any errors in the grant overhead
+ * calculations do not allow granting more space to clients than can be
+ * written. Assumes that in aggregate the grant overhead calculations do
+ * not have more than ddp_grant_reserved% estimation error in them. */
+ m->ofd_grant_ratio =
+ ofd_grant_ratio_conv(m->ofd_dt_conf.ddp_grant_reserved);
+
rc = ofd_start(env, &m->ofd_dt_dev.dd_lu_dev);
if (rc)
GOTO(err_fini_stack, rc);
ofd_stack_fini(env, m, &m->ofd_osd->dd_lu_dev);
err_lu_site:
lu_site_fini(&m->ofd_site);
-err_out:
+err_fini_proc:
+ ofd_procfs_fini(m);
return rc;
}
ofd_stack_fini(env, m, m->ofd_site.ls_top_dev);
lu_site_fini(&m->ofd_site);
+ ofd_procfs_fini(m);
LASSERT(cfs_atomic_read(&d->ld_ref) == 0);
EXIT;
}
info->fti_env = NULL;
info->fti_exp = NULL;
+
+ info->fti_xid = 0;
+ info->fti_transno = 0;
+ info->fti_pre_version = 0;
+ info->fti_obj = NULL;
+ info->fti_has_trans = 0;
+ info->fti_mult_trans = 0;
+ info->fti_used = 0;
+
+ memset(&info->fti_attr, 0, sizeof info->fti_attr);
}
struct lu_context_key ofd_thread_key = {
if (rc)
return rc;
+ rc = ofd_fmd_init();
+ if (rc) {
+ lu_kmem_fini(ofd_caches);
+ return(rc);
+ }
+
lprocfs_ofd_init_vars(&lvars);
rc = class_register_type(&ofd_obd_ops, NULL, lvars.module_vars,
void __exit ofd_exit(void)
{
- class_unregister_type(LUSTRE_OST_NAME);
+ ofd_fmd_exit();
lu_kmem_fini(ofd_caches);
+ class_unregister_type(LUSTRE_OST_NAME);
}
MODULE_AUTHOR("Whamcloud, Inc. <http://www.whamcloud.com/>");
git://git.whamcloud.com / fs / lustre-release.git / blobdiff