X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_oi.c;h=786e85b09dcdf5d0be9faed40ca1908ed1cdbe46;hp=f90e5183a70574a446bd09663baeb8496fecf53e;hb=519a65ddc04673022124f421e4809f8a87f790d7;hpb=2a7e1688e2c9bff8f18f5596c112c445d0039e94 diff --git a/lustre/osd-ldiskfs/osd_oi.c b/lustre/osd-ldiskfs/osd_oi.c index f90e518..786e85b 100644 --- a/lustre/osd-ldiskfs/osd_oi.c +++ b/lustre/osd-ldiskfs/osd_oi.c @@ -117,7 +117,7 @@ static int osd_oi_index_create_one(struct osd_thread_info *info, int rc; dentry = osd_child_dentry_by_inode(env, dir, name, strlen(name)); - bh = osd_ldiskfs_find_entry(dir, dentry, &de, NULL); + bh = osd_ldiskfs_find_entry(dir, &dentry->d_name, &de, NULL, NULL); if (bh) { osd_id_gen(id, le32_to_cpu(de->inode), OSD_OII_NOGEN); brelse(bh); @@ -129,7 +129,7 @@ static int osd_oi_index_create_one(struct osd_thread_info *info, return PTR_ERR(inode); } - jh = ldiskfs_journal_start_sb(sb, 100); + jh = osd_journal_start_sb(sb, LDISKFS_HT_MISC, 100); if (IS_ERR(jh)) return PTR_ERR(jh); @@ -229,6 +229,13 @@ static int osd_oi_open(struct osd_thread_info *info, struct osd_device *osd, RETURN(PTR_ERR(inode)); ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_NO_OI); + /* 'What the @fid is' is not imporatant, because these objects + * have no OI mappings, and only are visible inside the OSD.*/ + lu_igif_build(&info->oti_fid, inode->i_ino, inode->i_generation); + rc = osd_ea_fid_set(info, inode, &info->oti_fid, LMAC_NOT_IN_OI, 0); + if (rc != 0) + GOTO(out_inode, rc); + OBD_ALLOC_PTR(oi); if (oi == NULL) GOTO(out_inode, rc = -ENOMEM); @@ -361,6 +368,20 @@ int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd) /* if previous failed then try found single OI from old filesystem */ rc = osd_oi_open(info, osd, OSD_OI_NAME_BASE, &oi[0], false); if (rc == 0) { /* found single OI from old filesystem */ + if (sf->sf_success_count == 0) + /* XXX: There is one corner case that if the OI_scrub + * file crashed or lost and we regard it upgrade, + * then we allow IGIF lookup to bypass OI files. + * + * The risk is that osd_fid_lookup() may found + * a wrong inode with the given IGIF especially + * when the MDT has performed file-level backup + * and restored after former upgrading from 1.8 + * to 2.x. Fortunately, the osd_fid_lookup()can + * verify the inode to decrease the risk. */ + osd_scrub_file_reset(scrub, + LDISKFS_SB(osd_sb(osd))->s_es->s_uuid, + SF_UPGRADE); GOTO(out, rc = 1); } else if (rc != -ENOENT) { CERROR("%.16s: can't open %s: rc = %d\n", @@ -401,7 +422,16 @@ out: LASSERT((rc & (rc - 1)) == 0); osd->od_oi_table = oi; osd->od_oi_count = rc; - rc = 0; + if (sf->sf_oi_count != rc) { + sf->sf_oi_count = rc; + rc = osd_scrub_file_store(scrub); + if (rc < 0) { + osd_oi_table_put(info, oi, sf->sf_oi_count); + OBD_FREE(oi, sizeof(*oi) * OSD_OI_FID_NR_MAX); + } + } else { + rc = 0; + } } mutex_unlock(&oi_init_lock); @@ -461,37 +491,41 @@ static int osd_oi_iam_lookup(struct osd_thread_info *oti, } int fid_is_on_ost(struct osd_thread_info *info, struct osd_device *osd, - const struct lu_fid *fid) + const struct lu_fid *fid, enum oi_check_flags flags) { - struct lu_seq_range *range = &info->oti_seq_range; - int rc; + struct lu_seq_range *range = &info->oti_seq_range; + int rc; ENTRY; + if (flags & OI_KNOWN_ON_OST) + RETURN(1); + if (unlikely(fid_is_local_file(fid) || fid_is_igif(fid) || - fid_is_llog(fid))) + fid_is_llog(fid)) || fid_is_name_llog(fid) || + fid_is_quota(fid)) RETURN(0); if (fid_is_idif(fid) || fid_is_last_id(fid)) RETURN(1); - rc = osd_fld_lookup(info->oti_env, osd, fid, range); + if (!(flags & OI_CHECK_FLD)) + RETURN(0); + + rc = osd_fld_lookup(info->oti_env, osd, fid_seq(fid), range); if (rc != 0) { - CERROR("%s: Can not lookup fld for "DFID"\n", - osd_name(osd), PFID(fid)); + CERROR("%s: "DFID" lookup failed: rc = %d\n", osd_name(osd), + PFID(fid), rc); RETURN(rc); } - CDEBUG(D_INFO, "fid "DFID" range "DRANGE"\n", PFID(fid), - PRANGE(range)); - if (fld_range_is_ost(range)) RETURN(1); RETURN(0); } -int __osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd, - const struct lu_fid *fid, struct osd_inode_id *id) +static int __osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd, + const struct lu_fid *fid, struct osd_inode_id *id) { struct lu_fid *oi_fid = &info->oti_fid2; int rc; @@ -510,12 +544,12 @@ int __osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd, int osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd, const struct lu_fid *fid, struct osd_inode_id *id, - bool check_fld) + enum oi_check_flags flags) { if (unlikely(fid_is_last_id(fid))) return osd_obj_spec_lookup(info, osd, fid, id); - if ((check_fld && fid_is_on_ost(info, osd, fid)) || fid_is_llog(fid)) + if (fid_is_on_ost(info, osd, fid, flags) || fid_is_llog(fid)) return osd_obj_map_lookup(info, osd, fid, id); if (fid_is_fs_root(fid)) { @@ -570,7 +604,7 @@ static int osd_oi_iam_refresh(struct osd_thread_info *oti, struct osd_oi *oi, int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd, const struct lu_fid *fid, const struct osd_inode_id *id, - struct thandle *th) + struct thandle *th, enum oi_check_flags flags) { struct lu_fid *oi_fid = &info->oti_fid2; struct osd_inode_id *oi_id = &info->oti_id2; @@ -579,7 +613,7 @@ int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd, if (unlikely(fid_is_last_id(fid))) return osd_obj_spec_insert(info, osd, fid, id, th); - if (fid_is_on_ost(info, osd, fid) || fid_is_llog(fid)) + if (fid_is_on_ost(info, osd, fid, flags) || fid_is_llog(fid)) return osd_obj_map_insert(info, osd, fid, id, th); fid_cpu_to_be(oi_fid, fid); @@ -594,16 +628,12 @@ int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd, if (rc != -EEXIST) return rc; - rc = osd_oi_lookup(info, osd, fid, oi_id, false); - if (unlikely(rc != 0)) + rc = osd_oi_lookup(info, osd, fid, oi_id, 0); + if (rc != 0) return rc; - if (osd_id_eq(id, oi_id)) { - CERROR("%.16s: the FID "DFID" is there already:%u/%u\n", - LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name, - PFID(fid), id->oii_ino, id->oii_gen); - return -EEXIST; - } + if (unlikely(osd_id_eq(id, oi_id))) + return 0; /* Check whether the mapping for oi_id is valid or not. */ inode = osd_iget(info, osd, oi_id); @@ -622,7 +652,8 @@ int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd, if (rc != 0) return rc; - if (lu_fid_eq(fid, &lma->lma_self_fid)) { + if (!(lma->lma_compat & LMAC_NOT_IN_OI) && + lu_fid_eq(fid, &lma->lma_self_fid)) { CERROR("%.16s: the FID "DFID" is used by two objects: " "%u/%u %u/%u\n", LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name, @@ -675,14 +706,18 @@ static int osd_oi_iam_delete(struct osd_thread_info *oti, struct osd_oi *oi, int osd_oi_delete(struct osd_thread_info *info, struct osd_device *osd, const struct lu_fid *fid, - struct thandle *th) + struct thandle *th, enum oi_check_flags flags) { struct lu_fid *oi_fid = &info->oti_fid2; + /* clear idmap cache */ + if (lu_fid_eq(fid, &info->oti_cache.oic_fid)) + fid_zero(&info->oti_cache.oic_fid); + if (fid_is_last_id(fid)) return 0; - if (fid_is_on_ost(info, osd, fid) || fid_is_llog(fid)) + if (fid_is_on_ost(info, osd, fid, flags) || fid_is_llog(fid)) return osd_obj_map_delete(info, osd, fid, th); fid_cpu_to_be(oi_fid, fid); @@ -690,6 +725,33 @@ int osd_oi_delete(struct osd_thread_info *info, (const struct dt_key *)oi_fid, th); } +int osd_oi_update(struct osd_thread_info *info, struct osd_device *osd, + const struct lu_fid *fid, const struct osd_inode_id *id, + struct thandle *th, enum oi_check_flags flags) +{ + struct lu_fid *oi_fid = &info->oti_fid2; + struct osd_inode_id *oi_id = &info->oti_id2; + int rc = 0; + + if (unlikely(fid_is_last_id(fid))) + return osd_obj_spec_update(info, osd, fid, id, th); + + if (fid_is_on_ost(info, osd, fid, flags) || fid_is_llog(fid)) + return osd_obj_map_update(info, osd, fid, id, th); + + fid_cpu_to_be(oi_fid, fid); + osd_id_pack(oi_id, id); + rc = osd_oi_iam_refresh(info, osd_fid2oi(osd, fid), + (const struct dt_rec *)oi_id, + (const struct dt_key *)oi_fid, th, false); + if (rc != 0) + return rc; + + if (unlikely(fid_seq(fid) == FID_SEQ_LOCAL_FILE)) + rc = osd_obj_spec_update(info, osd, fid, id, th); + return rc; +} + int osd_oi_mod_init(void) { if (osd_oi_count == 0 || osd_oi_count > OSD_OI_FID_NR_MAX)