#define HALF_SEC (CFS_HZ >> 1)
+#define OSD_OTABLE_MAX_HASH 0x00000000ffffffffULL
+
#define SCRUB_NEXT_BREAK 1 /* exit current loop and process next group */
#define SCRUB_NEXT_CONTINUE 2 /* skip current object and process next bit */
#define SCRUB_NEXT_EXIT 3 /* exit all the loops */
scrub->os_full_speed = 0;
}
- if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT))
+ if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE))
scrub->os_full_speed = 1;
scrub->os_in_prior = 0;
goto iget;
/* XXX: Currently, no FID-in-LMA for OST object, so osd_oi_lookup()
- * wihtout checking FLD is enough.
+ * without checking FLD is enough.
*
* It should be updated if FID-in-LMA for OSD object introduced
* in the future. */
ops = DTO_INDEX_INSERT;
idx = osd_oi_fid2idx(dev, fid);
- sf->sf_flags |= SF_RECREATED | SF_INCONSISTENT;
- if (unlikely(!ldiskfs_test_bit(idx, sf->sf_oi_bitmap)))
- ldiskfs_set_bit(idx, sf->sf_oi_bitmap);
+ if (val == SCRUB_NEXT_NOLMA) {
+ rc = osd_ea_fid_set(info, inode, fid);
+ if (rc != 0)
+ GOTO(out, rc);
+ } else {
+ sf->sf_flags |= SF_RECREATED | SF_INCONSISTENT;
+ if (unlikely(!ldiskfs_test_bit(idx, sf->sf_oi_bitmap)))
+ ldiskfs_set_bit(idx, sf->sf_oi_bitmap);
+ }
} else if (osd_id_eq(lid, lid2)) {
GOTO(out, rc = 0);
} else {
if (result > 0) {
sf->sf_status = SS_COMPLETED;
memset(sf->sf_oi_bitmap, 0, SCRUB_OI_BITMAP_SIZE);
- sf->sf_flags &= ~(SF_RECREATED | SF_INCONSISTENT | SF_AUTO);
+ sf->sf_flags &= ~(SF_RECREATED | SF_INCONSISTENT |
+ SF_UPGRADE | SF_AUTO);
sf->sf_time_last_complete = sf->sf_time_last_checkpoint;
sf->sf_success_count++;
} else if (result == 0) {
#define SCRUB_IT_CRASH 2
static int osd_inode_iteration(struct osd_thread_info *info,
- struct osd_device *dev, __u32 max, int preload)
+ struct osd_device *dev, __u32 max, bool preload)
{
osd_iit_next_policy next;
osd_iit_exec_policy exec;
int rc;
ENTRY;
- if (preload == 0) {
+ if (!preload) {
struct osd_scrub *scrub = &dev->od_scrub;
next = osd_scrub_next;
brelse(param.bitmap);
RETURN(rc);
}
+
+ if (preload && dev->od_otable_it->ooi_stopping) {
+ brelse(param.bitmap);
+ RETURN(0);
+ }
}
next_group:
brelse(param.bitmap);
+
+ if (preload && dev->od_otable_it->ooi_stopping)
+ RETURN(0);
}
if (*pos > limit)
ENTRY;
rc = osd_inode_iteration(osd_oti_get(env), dev,
- OSD_OTABLE_IT_CACHE_SIZE, 1);
+ OSD_OTABLE_IT_CACHE_SIZE, true);
if (rc == SCRUB_IT_ALL)
it->ooi_all_cached = 1;
CDEBUG(D_LFSCK, "OI scrub: flags = 0x%x, pos = %u\n",
scrub->os_start_flags, scrub->os_pos_current);
- rc = osd_inode_iteration(osd_oti_get(&env), dev, ~0U, 0);
+ rc = osd_inode_iteration(osd_oti_get(&env), dev, ~0U, false);
if (unlikely(rc == SCRUB_IT_CRASH))
GOTO(out, rc = -EINVAL);
GOTO(post, rc);
return rc;
}
+/* initial OI scrub */
+
+typedef int (*scandir_t)(struct osd_thread_info *, struct osd_device *,
+ struct dentry *, filldir_t filldir);
+
+static int osd_ios_varfid_fill(void *buf, const char *name, int namelen,
+ loff_t offset, __u64 ino, unsigned d_type);
+
+static int
+osd_ios_general_scan(struct osd_thread_info *info, struct osd_device *dev,
+ struct dentry *dentry, filldir_t filldir);
+static int
+osd_ios_ROOT_scan(struct osd_thread_info *info, struct osd_device *dev,
+ struct dentry *dentry, filldir_t filldir);
+
+static int
+osd_ios_OBJECTS_scan(struct osd_thread_info *info, struct osd_device *dev,
+ struct dentry *dentry, filldir_t filldir);
+
+enum osd_lf_flags {
+ OLF_SCAN_SUBITEMS = 0x0001,
+ OLF_HIDE_FID = 0x0002,
+ OLF_SHOW_NAME = 0x0004,
+};
+
+struct osd_lf_map {
+ char *olm_name;
+ struct lu_fid olm_fid;
+ __u16 olm_flags;
+ scandir_t olm_scandir;
+ filldir_t olm_filldir;
+};
+
+/* Add the new introduced local files in the list in the future. */
+static const struct osd_lf_map osd_lf_maps[] = {
+ /* CATALOGS */
+ { CATLIST, { FID_SEQ_LOCAL_FILE, LLOG_CATALOGS_OID, 0 }, OLF_SHOW_NAME,
+ NULL, NULL },
+
+ /* CONFIGS */
+ { MOUNT_CONFIGS_DIR, { FID_SEQ_LOCAL_FILE, MGS_CONFIGS_OID, 0 },
+ OLF_SCAN_SUBITEMS, osd_ios_general_scan,
+ osd_ios_varfid_fill },
+
+ /* NIDTBL_VERSIONS */
+ { MGS_NIDTBL_DIR, { 0, 0, 0 }, OLF_SCAN_SUBITEMS,
+ osd_ios_general_scan, osd_ios_varfid_fill },
+
+ /* PENDING */
+ { "PENDING", { FID_SEQ_LOCAL_FILE, MDD_ORPHAN_OID, 0 }, 0, NULL, NULL },
+
+ /* ROOT */
+ { "ROOT", { FID_SEQ_LOCAL_FILE, MDD_ROOT_INDEX_OID, 0 },
+ OLF_SCAN_SUBITEMS | OLF_HIDE_FID, osd_ios_ROOT_scan, NULL },
+
+ /* capa_keys */
+ { CAPA_KEYS, { FID_SEQ_LOCAL_FILE, MDD_CAPA_KEYS_OID, 0 }, 0,
+ NULL, NULL },
+
+ /* changelog_catalog */
+ { CHANGELOG_CATALOG, { 0, 0, 0 }, 0, NULL, NULL },
+
+ /* changelog_users */
+ { CHANGELOG_USERS, { 0, 0, 0 }, 0, NULL, NULL },
+
+ /* fld */
+ { "fld", { FID_SEQ_LOCAL_FILE, FLD_INDEX_OID, 0 }, OLF_SHOW_NAME,
+ NULL, NULL },
+
+ /* last_rcvd */
+ { LAST_RCVD, { FID_SEQ_LOCAL_FILE, LAST_RECV_OID, 0 }, OLF_SHOW_NAME,
+ NULL, NULL },
+
+ /* lfsck_bookmark */
+ { "lfsck_bookmark", { FID_SEQ_LOCAL_FILE, LFSCK_BOOKMARK_OID, 0 }, 0,
+ NULL, NULL },
+
+ /* lov_objid */
+ { LOV_OBJID, { FID_SEQ_LOCAL_FILE, MDD_LOV_OBJ_OID, 0 }, OLF_SHOW_NAME,
+ NULL, NULL },
+
+ /* lov_objseq */
+ { LOV_OBJSEQ, { FID_SEQ_LOCAL_FILE, MDD_LOV_OBJ_OSEQ, 0 },
+ OLF_SHOW_NAME, NULL, NULL },
+
+ /* quota_master */
+ { QMT_DIR, { 0, 0, 0 }, OLF_SCAN_SUBITEMS,
+ osd_ios_general_scan, osd_ios_varfid_fill },
+
+ /* quota_slave */
+ { QSD_DIR, { 0, 0, 0 }, OLF_SCAN_SUBITEMS,
+ osd_ios_general_scan, osd_ios_varfid_fill },
+
+ /* seq-200000003-lastid */
+ { "seq-200000003-lastid", { FID_SEQ_LOCAL_NAME, 1, 0 }, 0,
+ NULL, NULL },
+
+ /* seq_ctl */
+ { "seq_ctl", { FID_SEQ_LOCAL_FILE, FID_SEQ_CTL_OID, 0 },
+ OLF_SHOW_NAME, NULL, NULL },
+
+ /* seq_srv */
+ { "seq_srv", { FID_SEQ_LOCAL_FILE, FID_SEQ_SRV_OID, 0 },
+ OLF_SHOW_NAME, NULL, NULL },
+
+ /* LAST_GROUP */
+ { "LAST_GROUP", { FID_SEQ_LOCAL_FILE, OFD_LAST_GROUP_OID, 0 },
+ OLF_SHOW_NAME, NULL, NULL },
+
+ /* health_check */
+ { HEALTH_CHECK, { FID_SEQ_LOCAL_FILE, OFD_HEALTH_CHECK_OID, 0 },
+ OLF_SHOW_NAME, NULL, NULL },
+
+ /* OBJECTS, upgrade from old device */
+ { OBJECTS, { 0, 0, 0 }, OLF_SCAN_SUBITEMS, osd_ios_OBJECTS_scan, NULL },
+
+ /* lquota_v2.user, upgrade from old device */
+ { "lquota_v2.user", { 0, 0, 0 }, 0, NULL, NULL },
+
+ /* lquota_v2.group, upgrade from old device */
+ { "lquota_v2.group", { 0, 0, 0 }, 0, NULL, NULL },
+
+ { NULL, { 0, 0, 0 }, 0, NULL, NULL }
+};
+
+struct osd_ios_item {
+ cfs_list_t oii_list;
+ struct dentry *oii_dentry;
+ scandir_t oii_scandir;
+ filldir_t oii_filldir;
+};
+
+struct osd_ios_filldir_buf {
+ struct osd_thread_info *oifb_info;
+ struct osd_device *oifb_dev;
+ struct dentry *oifb_dentry;
+};
+
+static inline struct dentry *
+osd_ios_lookup_one_len(const char *name, struct dentry *parent, int namelen)
+{
+ struct dentry *dentry;
+
+ dentry = ll_lookup_one_len(name, parent, namelen);
+ if (!IS_ERR(dentry) && dentry->d_inode == NULL) {
+ dput(dentry);
+ return ERR_PTR(-ENOENT);
+ }
+
+ return dentry;
+}
+
+static inline void
+osd_ios_llogname2fid(struct lu_fid *fid, const char *name, int namelen)
+{
+ obd_id id = 0;
+ int i = 0;
+
+ fid->f_seq = FID_SEQ_LLOG;
+ while (i < namelen)
+ id = id * 10 + name[i++] - '0';
+
+ fid->f_oid = id & 0x00000000ffffffffULL;
+ fid->f_ver = id >> 32;
+}
+
+static inline void
+osd_ios_Oname2fid(struct lu_fid *fid, const char *name, int namelen)
+{
+ __u64 seq = 0;
+ int i = 0;
+
+ while (i < namelen)
+ seq = seq * 10 + name[i++] - '0';
+
+ lu_last_id_fid(fid, seq);
+}
+
+static int
+osd_ios_new_item(struct osd_device *dev, struct dentry *dentry,
+ scandir_t scandir, filldir_t filldir)
+{
+ struct osd_ios_item *item;
+
+ OBD_ALLOC_PTR(item);
+ if (item == NULL)
+ return -ENOMEM;
+
+ CFS_INIT_LIST_HEAD(&item->oii_list);
+ item->oii_dentry = dget(dentry);
+ item->oii_scandir = scandir;
+ item->oii_filldir = filldir;
+ cfs_list_add_tail(&item->oii_list, &dev->od_ios_list);
+ return 0;
+}
+
+/**
+ * osd_ios_scan_one() - check/fix LMA FID and OI entry for one inode
+ *
+ * The passed \a inode's \a fid is verified against the LMA FID. If the \a fid
+ * is NULL or is empty the IGIF FID is used. The FID is verified in the OI to
+ * reference the inode, or fixed if it is missing or references another inode.
+ */
+static int
+osd_ios_scan_one(struct osd_thread_info *info, struct osd_device *dev,
+ struct inode *inode, const struct lu_fid *fid, int flags)
+{
+ struct lustre_mdt_attrs *lma = &info->oti_mdt_attrs;
+ struct osd_inode_id *id = &info->oti_id;
+ struct osd_inode_id *id2 = &info->oti_id2;
+ struct osd_scrub *scrub = &dev->od_scrub;
+ struct scrub_file *sf = &scrub->os_file;
+ struct lu_fid tfid;
+ int rc;
+ ENTRY;
+
+ rc = osd_get_lma(info, inode, &info->oti_obj_dentry, lma);
+ if (rc != 0 && rc != -ENODATA)
+ RETURN(rc);
+
+ osd_id_gen(id, inode->i_ino, inode->i_generation);
+ if (rc == -ENODATA) {
+ if (fid == NULL || fid_is_zero(fid) || flags & OLF_HIDE_FID)
+ lu_igif_build(&tfid, inode->i_ino, inode->i_generation);
+ else
+ tfid = *fid;
+ rc = osd_ea_fid_set(info, inode, &tfid);
+ if (rc != 0)
+ RETURN(rc);
+ } else {
+ tfid = lma->lma_self_fid;
+ }
+
+ rc = __osd_oi_lookup(info, dev, &tfid, id2);
+ if (rc != 0) {
+ if (rc != -ENOENT)
+ RETURN(rc);
+
+ rc = osd_scrub_refresh_mapping(info, dev, &tfid, id,
+ DTO_INDEX_INSERT);
+ RETURN(rc);
+ }
+
+ if (osd_id_eq_strict(id, id2))
+ RETURN(0);
+
+ if (!(sf->sf_flags & SF_INCONSISTENT)) {
+ osd_scrub_file_reset(scrub,
+ LDISKFS_SB(osd_sb(dev))->s_es->s_uuid,
+ SF_INCONSISTENT);
+ rc = osd_scrub_file_store(scrub);
+ if (rc != 0)
+ RETURN(rc);
+ }
+
+ rc = osd_scrub_refresh_mapping(info, dev, &tfid, id, DTO_INDEX_UPDATE);
+
+ RETURN(rc);
+}
+
+static int osd_ios_varfid_fill(void *buf, const char *name, int namelen,
+ loff_t offset, __u64 ino, unsigned d_type)
+{
+ struct osd_ios_filldir_buf *fill_buf = buf;
+ struct osd_device *dev = fill_buf->oifb_dev;
+ struct dentry *child;
+ int rc;
+ ENTRY;
+
+ /* skip any '.' started names */
+ if (name[0] == '.')
+ RETURN(0);
+
+ child = osd_ios_lookup_one_len(name, fill_buf->oifb_dentry, namelen);
+ if (IS_ERR(child))
+ RETURN(PTR_ERR(child));
+
+ rc = osd_ios_scan_one(fill_buf->oifb_info, dev, child->d_inode,
+ NULL, 0);
+ if (rc == 0 && S_ISDIR(child->d_inode->i_mode))
+ rc = osd_ios_new_item(dev, child, osd_ios_general_scan,
+ osd_ios_varfid_fill);
+ dput(child);
+
+ RETURN(rc);
+}
+
+static int osd_ios_root_fill(void *buf, const char *name, int namelen,
+ loff_t offset, __u64 ino, unsigned d_type)
+{
+ struct osd_ios_filldir_buf *fill_buf = buf;
+ struct osd_device *dev = fill_buf->oifb_dev;
+ const struct osd_lf_map *map;
+ struct dentry *child;
+ int rc = 0;
+ ENTRY;
+
+ /* skip any '.' started names */
+ if (name[0] == '.')
+ RETURN(0);
+
+ for (map = osd_lf_maps; map->olm_name != NULL; map++) {
+ if (strlen(map->olm_name) != namelen)
+ continue;
+
+ if (strncmp(map->olm_name, name, namelen) == 0)
+ break;
+ }
+
+ if (map->olm_name == NULL)
+ RETURN(0);
+
+ child = osd_ios_lookup_one_len(name, fill_buf->oifb_dentry, namelen);
+ if (IS_ERR(child))
+ RETURN(PTR_ERR(child));
+
+ rc = osd_ios_scan_one(fill_buf->oifb_info, dev, child->d_inode,
+ &map->olm_fid, map->olm_flags);
+ if (rc == 0 && map->olm_flags & OLF_SCAN_SUBITEMS)
+ rc = osd_ios_new_item(dev, child, map->olm_scandir,
+ map->olm_filldir);
+ dput(child);
+
+ RETURN(rc);
+}
+
+static int
+osd_ios_general_scan(struct osd_thread_info *info, struct osd_device *dev,
+ struct dentry *dentry, filldir_t filldir)
+{
+ struct osd_ios_filldir_buf buf = { info, dev, dentry };
+ struct file *filp = &info->oti_it_ea.oie_file;
+ struct inode *inode = dentry->d_inode;
+ const struct file_operations *fops = inode->i_fop;
+ int rc;
+ ENTRY;
+
+ LASSERT(filldir != NULL);
+
+ filp->f_pos = 0;
+ filp->f_dentry = dentry;
+ filp->f_mode = FMODE_64BITHASH;
+ filp->f_mapping = inode->i_mapping;
+ filp->f_op = fops;
+ filp->private_data = NULL;
+
+ rc = fops->readdir(filp, &buf, filldir);
+ fops->release(inode, filp);
+
+ RETURN(rc);
+}
+
+static int
+osd_ios_ROOT_scan(struct osd_thread_info *info, struct osd_device *dev,
+ struct dentry *dentry, filldir_t filldir)
+{
+ struct osd_scrub *scrub = &dev->od_scrub;
+ struct scrub_file *sf = &scrub->os_file;
+ struct dentry *child;
+ int rc;
+ ENTRY;
+
+ /* It is existing MDT device. */
+ dev->od_handle_nolma = 1;
+ child = osd_ios_lookup_one_len(dot_lustre_name, dentry,
+ strlen(dot_lustre_name));
+ if (IS_ERR(child)) {
+ rc = PTR_ERR(child);
+ if (rc == -ENOENT) {
+ /* It is 1.8 MDT device. */
+ if (!(sf->sf_flags & SF_UPGRADE)) {
+ osd_scrub_file_reset(scrub,
+ LDISKFS_SB(osd_sb(dev))->s_es->s_uuid,
+ SF_UPGRADE);
+ rc = osd_scrub_file_store(scrub);
+ } else {
+ rc = 0;
+ }
+ }
+ } else {
+ rc = osd_ios_scan_one(info, dev, child->d_inode, NULL, 0);
+ dput(child);
+ }
+
+ RETURN(rc);
+}
+
+static int
+osd_ios_OBJECTS_scan(struct osd_thread_info *info, struct osd_device *dev,
+ struct dentry *dentry, filldir_t filldir)
+{
+ struct dentry *child;
+ int rc;
+ ENTRY;
+
+ child = osd_ios_lookup_one_len(ADMIN_USR, dentry, strlen(ADMIN_USR));
+ if (!IS_ERR(child)) {
+ rc = osd_ios_scan_one(info, dev, child->d_inode, NULL, 0);
+ dput(child);
+ } else {
+ rc = PTR_ERR(child);
+ }
+
+ if (rc != 0 && rc != -ENOENT)
+ RETURN(rc);
+
+ child = osd_ios_lookup_one_len(ADMIN_GRP, dentry, strlen(ADMIN_GRP));
+ if (!IS_ERR(child)) {
+ rc = osd_ios_scan_one(info, dev, child->d_inode, NULL, 0);
+ dput(child);
+ } else {
+ rc = PTR_ERR(child);
+ }
+
+ if (rc == -ENOENT)
+ rc = 0;
+
+ RETURN(rc);
+}
+
+static int osd_initial_OI_scrub(struct osd_thread_info *info,
+ struct osd_device *dev)
+{
+ struct osd_ios_item *item = NULL;
+ scandir_t scandir = osd_ios_general_scan;
+ filldir_t filldir = osd_ios_root_fill;
+ struct dentry *dentry = osd_sb(dev)->s_root;
+ int rc;
+ ENTRY;
+
+ while (1) {
+ rc = scandir(info, dev, dentry, filldir);
+ if (item != NULL) {
+ dput(item->oii_dentry);
+ OBD_FREE_PTR(item);
+ }
+
+ if (rc != 0)
+ break;
+
+ if (cfs_list_empty(&dev->od_ios_list))
+ break;
+
+ item = cfs_list_entry(dev->od_ios_list.next,
+ struct osd_ios_item, oii_list);
+ cfs_list_del_init(&item->oii_list);
+
+ LASSERT(item->oii_scandir != NULL);
+ scandir = item->oii_scandir;
+ filldir = item->oii_filldir;
+ dentry = item->oii_dentry;
+ }
+
+ while (!cfs_list_empty(&dev->od_ios_list)) {
+ item = cfs_list_entry(dev->od_ios_list.next,
+ struct osd_ios_item, oii_list);
+ cfs_list_del_init(&item->oii_list);
+ dput(item->oii_dentry);
+ OBD_FREE_PTR(item);
+ }
+
+ RETURN(rc);
+}
+
+char *osd_lf_fid2name(const struct lu_fid *fid)
+{
+ const struct osd_lf_map *map = osd_lf_maps;
+
+ while (map->olm_name != NULL) {
+ if (!lu_fid_eq(fid, &map->olm_fid)) {
+ map++;
+ continue;
+ }
+
+ if (map->olm_flags & OLF_SHOW_NAME)
+ return map->olm_name;
+ else
+ return "";
+ }
+
+ return NULL;
+}
+
/* OI scrub start/stop */
static int do_osd_scrub_start(struct osd_device *dev, __u32 flags)
struct osd_scrub *scrub = &dev->od_scrub;
struct lvfs_run_ctxt *ctxt = &scrub->os_ctxt;
struct scrub_file *sf = &scrub->os_file;
- struct osd_inode_id *id = &scrub->os_oic.oic_lid;
struct super_block *sb = osd_sb(dev);
struct ldiskfs_super_block *es = LDISKFS_SB(sb)->s_es;
- struct inode *inode;
struct lvfs_run_ctxt saved;
struct file *filp;
int dirty = 0;
- int init = 0;
int rc = 0;
ENTRY;
if (rc == -ENOENT) {
osd_scrub_file_init(scrub, es->s_uuid);
dirty = 1;
- init = 1;
} else if (rc != 0) {
RETURN(rc);
} else {
if (rc < 0)
RETURN(rc);
- if (init != 0) {
- rc = __osd_oi_lookup(info, dev, &LU_DOT_LUSTRE_FID, id);
- if (rc == 0) {
- inode = osd_iget(info, dev, id);
- if (IS_ERR(inode)) {
- rc = PTR_ERR(inode);
- /* It is restored from old 2.x backup. */
- if (rc == -ENOENT || rc == -ESTALE) {
- osd_scrub_file_reset(scrub, es->s_uuid,
- SF_INCONSISTENT);
- rc = osd_scrub_file_store(scrub);
- }
- } else {
- iput(inode);
- }
- } else if (rc == -ENOENT) {
- rc = 0;
- }
- }
-
+ rc = osd_initial_OI_scrub(info, dev);
if (rc == 0 && !dev->od_noscrub &&
((sf->sf_status == SS_PAUSED) ||
(sf->sf_status == SS_CRASHED &&
- sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_AUTO)) ||
+ sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE |
+ SF_AUTO)) ||
(sf->sf_status == SS_INIT &&
- sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT))))
+ sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE))))
rc = osd_scrub_start(dev);
RETURN(rc);
dev->od_otable_it = it;
it->ooi_dev = dev;
+ it->ooi_pid = cfs_curproc_pid();
it->ooi_cache.ooc_consumer_idx = -1;
if (flags & DOIF_OUTUSED)
it->ooi_used_outside = 1;
}
rc = do_osd_scrub_start(dev, start);
- if (rc == -EALREADY) {
- it->ooi_cache.ooc_pos_preload = scrub->os_pos_current - 1;
- } else if (rc < 0) {
+ if (rc < 0 && rc != -EALREADY) {
dev->od_otable_it = NULL;
OBD_FREE_PTR(it);
- GOTO(out, it = ERR_PTR(-EALREADY));
- } else {
- it->ooi_cache.ooc_pos_preload = scrub->os_pos_current;
+ GOTO(out, it = ERR_PTR(rc));
}
+ it->ooi_cache.ooc_pos_preload = scrub->os_pos_current;
+
GOTO(out, it);
out:
OBD_FREE_PTR(it);
}
-/**
- * XXX: Temporary used to notify otable iteration to be paused.
- */
-static void osd_otable_it_put(const struct lu_env *env, struct dt_it *di)
+static int osd_otable_it_get(const struct lu_env *env,
+ struct dt_it *di, const struct dt_key *key)
{
- struct osd_device *dev = ((struct osd_otable_it *)di)->ooi_dev;
-
- /* od_otable_mutex: prevent curcurrent init/fini */
- mutex_lock(&dev->od_otable_mutex);
- dev->od_scrub.os_paused = 1;
- mutex_unlock(&dev->od_otable_mutex);
+ return 0;
}
/**
- * Set the OSD layer iteration start position as the specified key.
+ * It is hack here:
*
- * The LFSCK out of OSD layer does not know the detail of the key, so if there
- * are several keys, they cannot be compared out of OSD, so call "::get()" for
- * each key, and OSD will select the smallest one by itself.
+ * Sometimes the otable-based iteration driver (LFSCK) may be blocked in OSD
+ * layer when someone wants to stop/pause the iteration. Under such case, we
+ * need some mechanism to notify the event and wakeup the blocker.
*/
-static int osd_otable_it_get(const struct lu_env *env,
- struct dt_it *di, const struct dt_key *key)
+static void osd_otable_it_put(const struct lu_env *env, struct dt_it *di)
{
- struct osd_otable_it *it = (struct osd_otable_it *)di;
- struct osd_otable_cache *ooc = &it->ooi_cache;
- const char *str = (const char *)key;
- __u32 ino;
- ENTRY;
-
- /* Forbid to set iteration position after iteration started. */
- if (it->ooi_user_ready)
- RETURN(-EPERM);
-
- if (str[0] == '\0')
- RETURN(-EINVAL);
-
- if (sscanf(str, "%u", &ino) <= 0)
- RETURN(-EINVAL);
+ struct osd_otable_it *it = (struct osd_otable_it *)di;
+ struct osd_device *dev = it->ooi_dev;
- /* Skip the one that has been processed last time. */
- if (ooc->ooc_pos_preload > ++ino)
- ooc->ooc_pos_preload = ino;
+ /* od_otable_mutex: prevent curcurrent init/fini */
+ mutex_lock(&dev->od_otable_mutex);
+ if (it->ooi_pid == cfs_curproc_pid()) {
+ dev->od_scrub.os_paused = 1;
+ } else {
+ struct ptlrpc_thread *thread = &dev->od_scrub.os_thread;
- RETURN(0);
+ it->ooi_stopping = 1;
+ if (it->ooi_waiting)
+ cfs_waitq_broadcast(&thread->t_ctl_waitq);
+ }
+ mutex_unlock(&dev->od_otable_mutex);
}
static int osd_otable_it_next(const struct lu_env *env, struct dt_it *di)
it->ooi_waiting = 1;
l_wait_event(thread->t_ctl_waitq,
ooc->ooc_pos_preload < scrub->os_pos_current ||
- !thread_is_running(thread),
+ !thread_is_running(thread) ||
+ it->ooi_stopping,
&lwi);
it->ooi_waiting = 0;
if (!thread_is_running(thread) && !it->ooi_used_outside)
RETURN(1);
+ if (it->ooi_stopping)
+ RETURN(0);
+
rc = osd_otable_it_preload(env, it);
if (rc >= 0)
goto again;
static struct dt_key *osd_otable_it_key(const struct lu_env *env,
const struct dt_it *di)
{
- struct osd_otable_it *it = (struct osd_otable_it *)di;
- struct osd_otable_cache *ooc = &it->ooi_cache;
-
- sprintf(it->ooi_key, "%u",
- ooc->ooc_cache[ooc->ooc_consumer_idx].oic_lid.oii_ino);
- return (struct dt_key *)it->ooi_key;
+ return NULL;
}
static int osd_otable_it_key_size(const struct lu_env *env,
const struct dt_it *di)
{
- return sizeof(((struct osd_otable_it *)di)->ooi_key);
+ return sizeof(__u64);
}
static int osd_otable_it_rec(const struct lu_env *env, const struct dt_it *di,
return 0;
}
+static __u64 osd_otable_it_store(const struct lu_env *env,
+ const struct dt_it *di)
+{
+ struct osd_otable_it *it = (struct osd_otable_it *)di;
+ struct osd_otable_cache *ooc = &it->ooi_cache;
+ __u64 hash;
+
+ if (it->ooi_user_ready)
+ hash = ooc->ooc_pos_preload;
+ else
+ hash = ooc->ooc_cache[ooc->ooc_consumer_idx].oic_lid.oii_ino;
+ return hash;
+}
+
+/**
+ * Set the OSD layer iteration start position as the specified hash.
+ */
static int osd_otable_it_load(const struct lu_env *env,
const struct dt_it *di, __u64 hash)
{
struct osd_device *dev = it->ooi_dev;
struct osd_otable_cache *ooc = &it->ooi_cache;
struct osd_scrub *scrub = &dev->od_scrub;
+ int rc;
+ ENTRY;
+ /* Forbid to set iteration position after iteration started. */
if (it->ooi_user_ready)
- return 0;
+ RETURN(-EPERM);
+
+ if (hash > OSD_OTABLE_MAX_HASH)
+ hash = OSD_OTABLE_MAX_HASH;
+
+ /* Skip the one that has been processed last time. */
+ if (ooc->ooc_pos_preload > hash)
+ ooc->ooc_pos_preload = hash;
if (ooc->ooc_pos_preload <= LDISKFS_FIRST_INO(osd_sb(dev)))
ooc->ooc_pos_preload = LDISKFS_FIRST_INO(osd_sb(dev)) + 1;
+
it->ooi_user_ready = 1;
if (!scrub->os_full_speed)
cfs_waitq_broadcast(&scrub->os_thread.t_ctl_waitq);
/* Unplug OSD layer iteration by the first next() call. */
- return osd_otable_it_next(env, (struct dt_it *)it);
+ rc = osd_otable_it_next(env, (struct dt_it *)it);
+
+ RETURN(rc);
+}
+
+static int osd_otable_it_key_rec(const struct lu_env *env,
+ const struct dt_it *di, void *key_rec)
+{
+ return 0;
}
const struct dt_index_operations osd_otable_ops = {
.dio_it = {
.init = osd_otable_it_init,
.fini = osd_otable_it_fini,
- .put = osd_otable_it_put,
.get = osd_otable_it_get,
+ .put = osd_otable_it_put,
.next = osd_otable_it_next,
- .key = osd_otable_it_key,
+ .key = osd_otable_it_key,
.key_size = osd_otable_it_key_size,
.rec = osd_otable_it_rec,
+ .store = osd_otable_it_store,
.load = osd_otable_it_load,
+ .key_rec = osd_otable_it_key_rec,
}
};
"recreated",
"inconsistent",
"auto",
+ "upgrade",
NULL
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff