* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
struct mds_obd *mds = &obd->u.mds;
unsigned int i=0, j;
+ if ((libcfs_debug & D_INFO) == 0)
+ return;
+
CDEBUG(D_INFO, "dump from %s\n", label);
if (mds->mds_lov_page_dirty == NULL) {
CERROR("NULL bitmap!\n");
GOTO(skip_bitmap, i);
}
- for(i=0;i<((mds->mds_lov_page_dirty->size/BITS_PER_LONG)+1);i++)
- CDEBUG(D_INFO, "%u - %lx\n", i, mds->mds_lov_page_dirty->data[i]);
+ for(i = 0; i < mds->mds_lov_page_dirty->size / BITS_PER_LONG + 1; i++)
+ CDEBUG(D_INFO, "%u - %lx\n", i,
+ mds->mds_lov_page_dirty->data[i]);
skip_bitmap:
if (mds->mds_lov_page_array == NULL) {
CERROR("not init page array!\n");
GOTO(skip_array, i);
}
- for(i=0;i<MDS_LOV_OBJID_PAGES_COUNT;i++) {
+ for(i = 0;i < MDS_LOV_OBJID_PAGES_COUNT; i++) {
obd_id *data = mds->mds_lov_page_array[i];
if (data == NULL)
for(j=0; j < OBJID_PER_PAGE(); j++) {
if (data[j] == 0)
continue;
- CDEBUG(D_INFO,"objid page %u idx %u - %llu \n", i,j,data[j]);
+ CDEBUG(D_INFO,"objid page %u idx %u - "LPU64" \n",
+ i, j, data[j]);
}
}
skip_array:
CLASSERT(((MDS_LOV_ALLOC_SIZE % sizeof(obd_id)) == 0));
- mds->mds_lov_page_dirty = ALLOCATE_BITMAP(MDS_LOV_OBJID_PAGES_COUNT);
+ mds->mds_lov_page_dirty =
+ CFS_ALLOCATE_BITMAP(MDS_LOV_OBJID_PAGES_COUNT);
if (mds->mds_lov_page_dirty == NULL)
RETURN(-ENOMEM);
err_free:
OBD_FREE(mds->mds_lov_page_array, size);
err_free_bitmap:
- FREE_BITMAP(mds->mds_lov_page_dirty);
+ CFS_FREE_BITMAP(mds->mds_lov_page_dirty);
RETURN(rc);
}
}
if (mds->mds_lov_objid_filp) {
- rc = filp_close((struct file *)mds->mds_lov_objid_filp, 0);
+ rc = filp_close((struct file *)mds->mds_lov_objid_filp, NULL);
mds->mds_lov_objid_filp = NULL;
if (rc)
CERROR("%s file won't close, rc=%d\n", LOV_OBJID, rc);
}
- FREE_BITMAP(mds->mds_lov_page_dirty);
+ CFS_FREE_BITMAP(mds->mds_lov_page_dirty);
EXIT;
}
return 0;
}
+static int mds_lov_objinit(struct mds_obd *mds, __u32 index)
+{
+ __u32 page = index / OBJID_PER_PAGE();
+ __u32 off = index % OBJID_PER_PAGE();
+ obd_id *data = mds->mds_lov_page_array[page];
+
+ return (data[off] > 0);
+}
+
int mds_lov_prepare_objids(struct obd_device *obd, struct lov_mds_md *lmm)
{
struct lov_ost_data_v1 *data;
}
- mutex_down(&obd->obd_dev_sem);
+ cfs_mutex_down(&obd->obd_dev_sem);
for (j = 0; j < count; j++) {
__u32 i = le32_to_cpu(data[j].l_ost_idx);
if (mds_lov_update_max_ost(&obd->u.mds, i)) {
break;
}
}
- mutex_up(&obd->obd_dev_sem);
+ cfs_mutex_up(&obd->obd_dev_sem);
RETURN(rc);
}
EXPORT_SYMBOL(mds_lov_prepare_objids);
+/*
+ * write llog orphan record about lost ost object,
+ * Special lsm is allocated with single stripe, caller should deallocated it
+ * after use
+ */
+static int mds_log_lost_precreated(struct obd_device *obd,
+ struct lov_stripe_md **lsmp, int *stripes,
+ obd_id id, obd_count count, int idx)
+{
+ struct lov_stripe_md *lsm = *lsmp;
+ int rc;
+ ENTRY;
+
+ if (*lsmp == NULL) {
+ rc = obd_alloc_memmd(obd->u.mds.mds_lov_exp, &lsm);
+ if (rc < 0)
+ RETURN(rc);
+ /* need only one stripe, save old value */
+ *stripes = lsm->lsm_stripe_count;
+ lsm->lsm_stripe_count = 1;
+ *lsmp = lsm;
+ }
+
+ lsm->lsm_oinfo[0]->loi_id = id;
+ lsm->lsm_oinfo[0]->loi_seq = mdt_to_obd_objseq(obd->u.mds.mds_id);
+ lsm->lsm_oinfo[0]->loi_ost_idx = idx;
+
+ rc = mds_log_op_orphan(obd, lsm, count);
+ RETURN(rc);
+}
+
void mds_lov_update_objids(struct obd_device *obd, struct lov_mds_md *lmm)
{
struct mds_obd *mds = &obd->u.mds;
int j;
struct lov_ost_data_v1 *obj;
+ struct lov_stripe_md *lsm = NULL;
+ int stripes = 0;
int count;
ENTRY;
switch (le32_to_cpu(lmm->lmm_magic)) {
case LOV_MAGIC_V1:
count = le32_to_cpu(((struct lov_mds_md_v1*)lmm)->lmm_stripe_count);
- obj = &(((struct lov_mds_md_v1*)lmm)->lmm_objects[0]);
+ obj = ((struct lov_mds_md_v1*)lmm)->lmm_objects;
break;
case LOV_MAGIC_V3:
count = le32_to_cpu(((struct lov_mds_md_v3*)lmm)->lmm_stripe_count);
- obj = &(((struct lov_mds_md_v3*)lmm)->lmm_objects[0]);
+ obj = ((struct lov_mds_md_v3*)lmm)->lmm_objects;
break;
default:
- CERROR("Unknow lmm type %X !\n", le32_to_cpu(lmm->lmm_magic));
+ CERROR("Unknow lmm type %X !\n",
+ le32_to_cpu(lmm->lmm_magic));
return;
}
CDEBUG(D_INODE,"update last object for ost %u"
" - new "LPU64" old "LPU64"\n", i, id, data[idx]);
if (id > data[idx]) {
+ int lost = id - data[idx] - 1;
+ /* we might have lost precreated objects due to VBR */
+ if (lost > 0 && obd->obd_recovering) {
+ CDEBUG(D_HA, "Gap in objids is %u\n", lost);
+ if (!obd->obd_version_recov)
+ CERROR("Unexpected gap in objids\n");
+ /* lsm is allocated if NULL */
+ mds_log_lost_precreated(obd, &lsm, &stripes,
+ data[idx]+1, lost, i);
+ }
data[idx] = id;
cfs_bitmap_set(mds->mds_lov_page_dirty, page);
}
}
+ if (lsm) {
+ /* restore stripes number */
+ lsm->lsm_stripe_count = stripes;
+ obd_free_memmd(mds->mds_lov_exp, &lsm);
+ }
EXIT;
return;
}
EXPORT_SYMBOL(mds_lov_update_objids);
-
static int mds_lov_update_from_read(struct mds_obd *mds, obd_id *data,
__u32 count)
{
__u32 i;
__u32 stripes;
- for(i = 0; i < count; i++) {
+ for (i = 0; i < count; i++) {
if (data[i] == 0)
continue;
mds->mds_max_cookiesize = stripes * sizeof(struct llog_cookie);
CDEBUG(D_CONFIG, "updated max_mdsize/max_cookiesize for %d stripes: "
- "%d/%d\n", stripes, mds->mds_max_mdsize, mds->mds_max_cookiesize);
+ "%d/%d\n", stripes, mds->mds_max_mdsize,
+ mds->mds_max_cookiesize);
EXIT;
return 0;
{
struct mds_obd *mds = &obd->u.mds;
loff_t off = 0;
- int i, rc, count = 0, page = 0;
+ int i, rc = 0, count = 0, page = 0;
unsigned long size;
ENTRY;
if (size == 0)
RETURN(0);
- page = (size / (OBJID_PER_PAGE() * sizeof(obd_id))) + 1;
+ page = (size + MDS_LOV_ALLOC_SIZE - 1) / MDS_LOV_ALLOC_SIZE;
CDEBUG(D_INFO, "file size %lu pages %d\n", size, page);
-
for (i = 0; i < page; i++) {
+ obd_id *data;
loff_t off_old = off;
LASSERT(mds->mds_lov_page_array[i] == NULL);
if (mds->mds_lov_page_array[i] == NULL)
GOTO(out, rc = -ENOMEM);
- rc = fsfilt_read_record(obd, mds->mds_lov_objid_filp, mds->mds_lov_page_array[i],
- OBJID_PER_PAGE()*sizeof(obd_id), &off);
+ data = mds->mds_lov_page_array[i];
+
+ rc = fsfilt_read_record(obd, mds->mds_lov_objid_filp, data,
+ MDS_LOV_ALLOC_SIZE, &off);
if (rc < 0) {
CERROR("Error reading objids %d\n", rc);
GOTO(out, rc);
}
+ if (off == off_old) /* hole is read */
+ off += MDS_LOV_ALLOC_SIZE;
- count += (off - off_old)/sizeof(obd_id);
- if (mds_lov_update_from_read(mds, mds->mds_lov_page_array[i], count)) {
- CERROR("Can't update mds data\n");
- GOTO(out, rc = -EIO);
- }
-
- if (off == off_old)
- break; // eof
+ count = (off - off_old) / sizeof(obd_id);
+ if (mds_lov_update_from_read(mds, data, count)) {
+ CERROR("Can't update mds data\n");
+ GOTO(out, rc = -EIO);
+ }
}
- mds->mds_lov_objid_lastpage = i;
- mds->mds_lov_objid_lastidx = count % OBJID_PER_PAGE();
+ mds->mds_lov_objid_lastpage = page - 1;
+ mds->mds_lov_objid_lastidx = count - 1;
CDEBUG(D_INFO, "Read %u - %u %u objid\n", mds->mds_lov_objid_count,
mds->mds_lov_objid_lastpage, mds->mds_lov_objid_lastidx);
out:
mds_lov_dump_objids("read",obd);
- RETURN(0);
+ RETURN(rc);
}
int mds_lov_write_objids(struct obd_device *obd)
{
struct mds_obd *mds = &obd->u.mds;
- int i, rc = 0;
+ int i = 0, rc = 0;
ENTRY;
if (cfs_bitmap_check_empty(mds->mds_lov_page_dirty))
cfs_foreach_bit(mds->mds_lov_page_dirty, i) {
obd_id *data = mds->mds_lov_page_array[i];
- unsigned int size = OBJID_PER_PAGE()*sizeof(obd_id);
+ unsigned int size = MDS_LOV_ALLOC_SIZE;
loff_t off = i * size;
LASSERT(data != NULL);
+ if (!cfs_bitmap_test_and_clear(mds->mds_lov_page_dirty, i))
+ continue;
+
/* check for particaly filled last page */
if (i == mds->mds_lov_objid_lastpage)
size = (mds->mds_lov_objid_lastidx+1) * sizeof(obd_id);
+ CDEBUG(D_INFO, "write %lld - %u\n", off, size);
rc = fsfilt_write_record(obd, mds->mds_lov_objid_filp, data,
size, &off, 0);
- if (rc < 0)
+ if (rc < 0) {
+ cfs_bitmap_set(mds->mds_lov_page_dirty, i);
break;
- cfs_bitmap_clear(mds->mds_lov_page_dirty, i);
+ }
}
if (rc >= 0)
rc = 0;
obd_id idx)
{
struct mds_obd *mds = &obd->u.mds;
+ struct obd_export *lov_exp = mds->mds_lov_exp;
unsigned int page;
unsigned int off;
obd_id *data;
+ __u32 size;
int rc = 0;
ENTRY;
page = idx / OBJID_PER_PAGE();
off = idx % OBJID_PER_PAGE();
data = mds->mds_lov_page_array[page];
+
if (data[off] < 2) {
/* We never read this lastid; ask the osc */
struct obd_id_info lastid;
- __u32 size = sizeof(lastid);
+ size = sizeof(lastid);
lastid.idx = idx;
lastid.data = &data[off];
- rc = obd_get_info(mds->mds_osc_exp, sizeof(KEY_LAST_ID),
- KEY_LAST_ID, &size, &lastid, NULL);
+ rc = obd_get_info(lov_exp, sizeof(KEY_LAST_ID), KEY_LAST_ID,
+ &size, &lastid, NULL);
if (rc)
GOTO(out, rc);
+ /* workaround for clean filter */
+ if (data[off] == 0)
+ data[off] = 1;
+
cfs_bitmap_set(mds->mds_lov_page_dirty, page);
}
+ CDEBUG(D_INFO, "idx "LPU64" - %p - %d/%d - "LPU64"\n",
+ idx, data, page, off, data[off]);
out:
RETURN(rc);
}
int mds_lov_clear_orphans(struct mds_obd *mds, struct obd_uuid *ost_uuid)
{
int rc;
- struct obdo oa;
+ struct obdo oa = { 0 };
struct obd_trans_info oti = {0};
struct lov_stripe_md *empty_ea = NULL;
ENTRY;
* objects above this ID, they will be removed. */
memset(&oa, 0, sizeof(oa));
oa.o_flags = OBD_FL_DELORPHAN;
- oa.o_gr = mdt_to_obd_objgrp(mds->mds_id);
+ oa.o_seq = mdt_to_obd_objseq(mds->mds_id);
oa.o_valid = OBD_MD_FLFLAGS | OBD_MD_FLGROUP;
if (ost_uuid != NULL)
oti.oti_ost_uuid = ost_uuid;
- rc = obd_create(mds->mds_osc_exp, &oa, &empty_ea, &oti);
+
+ rc = obd_create(mds->mds_lov_exp, &oa, &empty_ea, &oti);
RETURN(rc);
}
info.idx = idx;
info.data = id;
- rc = obd_set_info_async(mds->mds_osc_exp, sizeof(KEY_NEXT_ID),
+ rc = obd_set_info_async(mds->mds_lov_exp, sizeof(KEY_NEXT_ID),
KEY_NEXT_ID, sizeof(info), &info, NULL);
if (rc)
CERROR ("%s: mds_lov_set_nextid failed (%d)\n",
if (!ld)
RETURN(-ENOMEM);
- rc = obd_get_info(mds->mds_osc_exp, sizeof(KEY_LOVDESC), KEY_LOVDESC,
+ rc = obd_get_info(mds->mds_lov_exp, sizeof(KEY_LOVDESC), KEY_LOVDESC,
&valsize, ld, NULL);
if (rc)
GOTO(out, rc);
CDEBUG(D_CONFIG, "updated lov_desc, tgt_count: %d - idx %d / uuid %s\n",
mds->mds_lov_desc.ld_tgt_count, idx, uuid->uuid);
- mutex_down(&obd->obd_dev_sem);
+ cfs_mutex_down(&obd->obd_dev_sem);
rc = mds_lov_update_max_ost(mds, idx);
- mutex_up(&obd->obd_dev_sem);
+ cfs_mutex_up(&obd->obd_dev_sem);
if (rc != 0)
GOTO(out, rc );
-
/* If we added a target we have to reconnect the llogs */
/* We only _need_ to do this at first add (idx), or the first time
after recovery. However, it should now be safe to call anytime. */
- rc = llog_cat_initialize(obd, &obd->obd_olg, idx, uuid);
+ rc = obd_llog_init(obd, &obd->obd_olg, obd, &idx);
if (rc)
GOTO(out, rc);
- /*XXX this notifies the MDD until lov handling use old mds code */
- if (obd->obd_upcall.onu_owner) {
- LASSERT(obd->obd_upcall.onu_upcall != NULL);
- rc = obd->obd_upcall.onu_upcall(obd, NULL, OBD_NOTIFY_ACTIVE,
- obd->obd_upcall.onu_owner);
- }
out:
OBD_FREE(ld, sizeof(*ld));
RETURN(rc);
int page;
int off;
obd_id *data;
-
ENTRY;
- /* Don't let anyone else mess with mds_lov_objids now */
- rc = mds_lov_update_desc(obd, idx, &watched->u.cli.cl_target_uuid);
- if (rc)
- GOTO(out, rc);
+ LASSERT(mds_lov_objinit(mds, idx));
CDEBUG(D_CONFIG, "idx=%d, recov=%d/%d, cnt=%d\n",
idx, obd->obd_recovering, obd->obd_async_recov,
int rc;
ENTRY;
- if (IS_ERR(mds->mds_osc_obd))
- RETURN(PTR_ERR(mds->mds_osc_obd));
+ if (IS_ERR(mds->mds_lov_obd))
+ RETURN(PTR_ERR(mds->mds_lov_obd));
- if (mds->mds_osc_obd)
+ if (mds->mds_lov_obd)
RETURN(0);
- mds->mds_osc_obd = class_name2obd(lov_name);
- if (!mds->mds_osc_obd) {
+ mds->mds_lov_obd = class_name2obd(lov_name);
+ if (!mds->mds_lov_obd) {
CERROR("MDS cannot locate LOV %s\n", lov_name);
- mds->mds_osc_obd = ERR_PTR(-ENOTCONN);
+ mds->mds_lov_obd = ERR_PTR(-ENOTCONN);
RETURN(-ENOTCONN);
}
- mutex_down(&obd->obd_dev_sem);
+ cfs_mutex_down(&obd->obd_dev_sem);
rc = mds_lov_read_objids(obd);
- mutex_up(&obd->obd_dev_sem);
+ cfs_mutex_up(&obd->obd_dev_sem);
if (rc) {
CERROR("cannot read %s: rc = %d\n", "lov_objids", rc);
GOTO(err_exit, rc);
}
- rc = obd_register_observer(mds->mds_osc_obd, obd);
+ rc = obd_register_observer(mds->mds_lov_obd, obd);
if (rc) {
CERROR("MDS cannot register as observer of LOV %s (%d)\n",
lov_name, rc);
GOTO(err_exit, rc);
}
- mds->mds_osc_obd->u.lov.lov_sp_me = LUSTRE_SP_MDT;
+ /* ask lov to generate OBD_NOTIFY_CREATE events for already registered
+ * targets */
+ obd_notify(mds->mds_lov_obd, NULL, OBD_NOTIFY_CREATE, NULL);
+
+ mds->mds_lov_obd->u.lov.lov_sp_me = LUSTRE_SP_MDT;
OBD_ALLOC(data, sizeof(*data));
if (data == NULL)
- RETURN(-ENOMEM);
+ GOTO(err_exit, rc = -ENOMEM);
+
data->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_INDEX |
OBD_CONNECT_REQPORTAL | OBD_CONNECT_QUOTA64 |
OBD_CONNECT_OSS_CAPA | OBD_CONNECT_FID |
OBD_CONNECT_BRW_SIZE | OBD_CONNECT_CKSUM |
OBD_CONNECT_CHANGE_QS | OBD_CONNECT_AT |
- OBD_CONNECT_MDS;
+ OBD_CONNECT_MDS | OBD_CONNECT_SKIP_ORPHAN |
+ OBD_CONNECT_SOM | OBD_CONNECT_FULL20;
#ifdef HAVE_LRU_RESIZE_SUPPORT
data->ocd_connect_flags |= OBD_CONNECT_LRU_RESIZE;
#endif
data->ocd_version = LUSTRE_VERSION_CODE;
- data->ocd_group = mdt_to_obd_objgrp(mds->mds_id);
+ data->ocd_group = mdt_to_obd_objseq(mds->mds_id);
/* send max bytes per rpc */
data->ocd_brw_size = PTLRPC_MAX_BRW_PAGES << CFS_PAGE_SHIFT;
/* send the list of supported checksum types */
data->ocd_cksum_types = OBD_CKSUM_ALL;
/* NB: lov_connect() needs to fill in .ocd_index for each OST */
- rc = obd_connect(NULL, &mds->mds_osc_exp, mds->mds_osc_obd, &obd->obd_uuid, data, NULL);
+ rc = obd_connect(NULL, &mds->mds_lov_exp, mds->mds_lov_obd, &obd->obd_uuid, data, NULL);
OBD_FREE(data, sizeof(*data));
if (rc) {
CERROR("MDS cannot connect to LOV %s (%d)\n", lov_name, rc);
- mds->mds_osc_obd = ERR_PTR(rc);
+ mds->mds_lov_obd = ERR_PTR(rc);
RETURN(rc);
}
RETURN(rc);
err_exit:
- mds->mds_osc_exp = NULL;
- mds->mds_osc_obd = ERR_PTR(rc);
+ mds->mds_lov_exp = NULL;
+ mds->mds_lov_obd = ERR_PTR(rc);
RETURN(rc);
}
int rc = 0;
ENTRY;
- if (!IS_ERR(mds->mds_osc_obd) && mds->mds_osc_exp != NULL) {
- obd_register_observer(mds->mds_osc_obd, NULL);
+ if (!IS_ERR(mds->mds_lov_obd) && mds->mds_lov_exp != NULL) {
+ obd_register_observer(mds->mds_lov_obd, NULL);
/* The actual disconnect of the mds_lov will be called from
* class_disconnect_exports from mds_lov_clean. So we have to
* ensure that class_cleanup doesn't fail due to the extra ref
* we're holding now. The mechanism to do that already exists -
* the obd_force flag. We'll drop the final ref to the
- * mds_osc_exp in mds_cleanup. */
- mds->mds_osc_obd->obd_force = 1;
+ * mds_lov_exp in mds_cleanup. */
+ mds->mds_lov_obd->obd_force = 1;
}
RETURN(rc);
}
struct mds_lov_sync_info {
- struct obd_device *mlsi_obd; /* the lov device to sync */
- struct obd_device *mlsi_watched; /* target osc */
- __u32 mlsi_index; /* index of target */
+ struct obd_device *mlsi_obd; /* the lov device to sync */
+ struct obd_device *mlsi_watched; /* target osc */
+ __u32 mlsi_index; /* index of target */
};
-static int mds_propagate_capa_keys(struct mds_obd *mds)
+static int mds_propagate_capa_keys(struct mds_obd *mds, struct obd_uuid *uuid)
{
+ struct mds_capa_info info = { .uuid = uuid };
struct lustre_capa_key *key;
int i, rc = 0;
if (!mds->mds_capa_keys)
RETURN(0);
+ OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_SYNC_CAPA_SL, 5);
for (i = 0; i < 2; i++) {
key = &mds->mds_capa_keys[i];
DEBUG_CAPA_KEY(D_SEC, key, "propagate");
- rc = obd_set_info_async(mds->mds_osc_exp, sizeof(KEY_CAPA_KEY),
- KEY_CAPA_KEY, sizeof(*key), key, NULL);
+ info.capa = key;
+ rc = obd_set_info_async(mds->mds_lov_exp, sizeof(KEY_CAPA_KEY),
+ KEY_CAPA_KEY, sizeof(info), &info, NULL);
if (rc) {
DEBUG_CAPA_KEY(D_ERROR, key,
"propagate failed (rc = %d) for", rc);
uuid = &watched->u.cli.cl_target_uuid;
LASSERT(uuid);
- down_read(&mds->mds_notify_lock);
+ cfs_down_read(&mds->mds_notify_lock);
if (obd->obd_stopping || obd->obd_fail)
GOTO(out, rc = -ENODEV);
CERROR("%s failed at update_mds: %d\n", obd_uuid2str(uuid), rc);
GOTO(out, rc);
}
- mgi.group = mdt_to_obd_objgrp(mds->mds_id);
+ mgi.group = mdt_to_obd_objseq(mds->mds_id);
mgi.uuid = uuid;
- rc = obd_set_info_async(mds->mds_osc_exp, sizeof(KEY_MDS_CONN),
+ rc = obd_set_info_async(mds->mds_lov_exp, sizeof(KEY_MDS_CONN),
KEY_MDS_CONN, sizeof(mgi), &mgi, NULL);
if (rc != 0)
GOTO(out, rc);
/* propagate capability keys */
- rc = mds_propagate_capa_keys(mds);
+ rc = mds_propagate_capa_keys(mds, uuid);
if (rc)
GOTO(out, rc);
LCONSOLE_INFO("MDS %s: %s now active, resetting orphans\n",
obd->obd_name, obd_uuid2str(uuid));
+
rc = mds_lov_clear_orphans(mds, uuid);
if (rc != 0) {
CERROR("%s failed at mds_lov_clear_orphans: %d\n",
GOTO(out, rc);
}
+#ifdef HAVE_QUOTA_SUPPORT
if (obd->obd_upcall.onu_owner) {
/*
* This is a hack for mds_notify->mdd_notify. When the mds obd
* in mdd is removed, This hack should be removed.
*/
- LASSERT(obd->obd_upcall.onu_upcall != NULL);
- rc = obd->obd_upcall.onu_upcall(obd, NULL, OBD_NOTIFY_ACTIVE,
- obd->obd_upcall.onu_owner);
+ LASSERT(obd->obd_upcall.onu_upcall != NULL);
+ rc = obd->obd_upcall.onu_upcall(obd, NULL, OBD_NOTIFY_QUOTA,
+ obd->obd_upcall.onu_owner,NULL);
}
+#endif
EXIT;
out:
- up_read(&mds->mds_notify_lock);
+ cfs_up_read(&mds->mds_notify_lock);
if (rc) {
/* Deactivate it for safety */
CERROR("%s sync failed %d, deactivating\n", obd_uuid2str(uuid),
rc);
- if (!obd->obd_stopping && mds->mds_osc_obd &&
- !mds->mds_osc_obd->obd_stopping && !watched->obd_stopping)
- obd_notify(mds->mds_osc_obd, watched,
+ if (!obd->obd_stopping && mds->mds_lov_obd &&
+ !mds->mds_lov_obd->obd_stopping && !watched->obd_stopping)
+ obd_notify(mds->mds_lov_obd, watched,
OBD_NOTIFY_INACTIVE, NULL);
}
char name[20];
snprintf(name, sizeof(name), "ll_sync_%02u", mlsi->mlsi_index);
- ptlrpc_daemonize(name);
+ cfs_daemonize_ctxt(name);
RETURN(__mds_lov_synchronize(data));
}
int mds_lov_start_synchronize(struct obd_device *obd,
struct obd_device *watched,
- void *data, int nonblock)
+ void *data, enum obd_notify_event ev)
{
struct mds_lov_sync_info *mlsi;
int rc;
finish for as long as the sync is blocking. */
class_incref(obd, "mds_lov_synchronize", obd);
- if (nonblock) {
+ if (ev != OBD_NOTIFY_SYNC) {
/* Synchronize in the background */
rc = cfs_kernel_thread(mds_lov_synchronize, mlsi,
CLONE_VM | CLONE_FILES);
int mds_notify(struct obd_device *obd, struct obd_device *watched,
enum obd_notify_event ev, void *data)
{
+ struct mds_obd *mds = &obd->u.mds;
int rc = 0;
ENTRY;
CDEBUG(D_CONFIG, "notify %s ev=%d\n", watched->obd_name, ev);
+ if (strcmp(watched->obd_type->typ_name, LUSTRE_OSC_NAME) != 0) {
+ CERROR("unexpected notification of %s %s!\n",
+ watched->obd_type->typ_name, watched->obd_name);
+ RETURN(-EINVAL);
+ }
+
+ /*XXX this notifies the MDD until lov handling use old mds code
+ * must non block!
+ */
+ if (obd->obd_upcall.onu_owner) {
+ LASSERT(obd->obd_upcall.onu_upcall != NULL);
+ rc = obd->obd_upcall.onu_upcall(obd, NULL, ev,
+ obd->obd_upcall.onu_owner,
+ &mds->mds_obt.obt_mount_count);
+ }
+
switch (ev) {
/* We only handle these: */
+ case OBD_NOTIFY_CREATE:
+ CWARN("MDS %s: add target %s\n",obd->obd_name,
+ obd_uuid2str(&watched->u.cli.cl_target_uuid));
+ /* We still have to fix the lov descriptor for ost's */
+ LASSERT(data);
+ rc = mds_lov_update_desc(obd, *(__u32 *)data,
+ &watched->u.cli.cl_target_uuid);
+ RETURN(rc);
case OBD_NOTIFY_ACTIVE:
/* lov want one or more _active_ targets for work */
/* activate event should be pass lov idx as argument */
case OBD_NOTIFY_SYNC_NONBLOCK:
/* sync event should be pass lov idx as argument */
break;
- case OBD_NOTIFY_CONFIG:
default:
RETURN(0);
}
- if (strcmp(watched->obd_type->typ_name, LUSTRE_OSC_NAME) != 0) {
- CERROR("unexpected notification of %s %s!\n",
- watched->obd_type->typ_name, watched->obd_name);
- RETURN(-EINVAL);
- }
-
if (obd->obd_recovering) {
CWARN("MDS %s: in recovery, not resetting orphans on %s\n",
obd->obd_name,
after the mdt in the config log. They didn't make it into
mds_lov_connect. */
rc = mds_lov_update_desc(obd, *(__u32 *)data,
- &watched->u.cli.cl_target_uuid);
- RETURN(rc);
+ &watched->u.cli.cl_target_uuid);
+ } else {
+ rc = mds_lov_start_synchronize(obd, watched, data, ev);
}
-
- rc = mds_lov_start_synchronize(obd, watched, data,
- !(ev == OBD_NOTIFY_SYNC));
-
RETURN(rc);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff