* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
*/
/*
* lustre/osd-ldiskfs/osd_scrub.c
* Author: Fan Yong <yong.fan@whamcloud.com>
*/
-#define DEBUG_SUBSYSTEM S_MDS
+#define DEBUG_SUBSYSTEM S_LFSCK
+#include <linux/kthread.h>
#include <lustre/lustre_idl.h>
#include <lustre_disk.h>
#include <dt_object.h>
#include "osd_oi.h"
#include "osd_scrub.h"
-#define HALF_SEC (HZ >> 1)
+#define HALF_SEC msecs_to_jiffies(MSEC_PER_SEC >> 1)
#define OSD_OTABLE_MAX_HASH 0x00000000ffffffffULL
return scrub->os_pos_current < ooc->ooc_pos_preload + SCRUB_WINDOW_SIZE;
}
+static inline const char *osd_scrub2name(struct osd_scrub *scrub)
+{
+ return LDISKFS_SB(osd_scrub2sb(scrub))->s_es->s_volume_name;
+}
+
/**
* update/insert/delete the specified OI mapping (@fid @id) according to the ops
*
/* DTO_INDEX_INSERT is enough for other two ops:
* delete/update, but save stack. */
- th = ldiskfs_journal_start_sb(osd_sb(dev),
+ th = osd_journal_start_sb(osd_sb(dev), LDISKFS_HT_MISC,
osd_dto_credits_noquota[DTO_INDEX_INSERT]);
if (IS_ERR(th)) {
rc = PTR_ERR(th);
- CERROR("%s: fail to start trans for scrub %d: rc = %d\n",
- osd_name(dev), ops, rc);
+ CDEBUG(D_LFSCK, "%s: fail to start trans for scrub op %d "
+ DFID" => %u/%u: rc = %d\n", osd_name(dev), ops,
+ PFID(fid), id->oii_ino, id->oii_gen, rc);
RETURN(rc);
}
}
ldiskfs_journal_stop(th);
- return rc;
+ if (rc < 0)
+ CDEBUG(D_LFSCK, "%s: fail to refresh OI map for scrub op %d "
+ DFID" => %u/%u: rc = %d\n", osd_name(dev), ops,
+ PFID(fid), id ? id->oii_ino : -1, id ? id->oii_gen : -1,
+ rc);
+
+ RETURN(rc);
}
/* OI_scrub file ops */
{
struct scrub_file *sf = &scrub->os_file;
- CDEBUG(D_LFSCK, "Reset OI scrub file, flags = "LPX64"\n", flags);
+ CDEBUG(D_LFSCK, "%.16s: reset OI scrub file, old flags = "
+ LPX64", add flags = "LPX64"\n",
+ osd_scrub2name(scrub), sf->sf_flags, flags);
+
memcpy(sf->sf_uuid, uuid, 16);
sf->sf_status = SS_INIT;
sf->sf_flags |= flags;
+ sf->sf_flags &= ~SF_AUTO;
sf->sf_run_time = 0;
sf->sf_time_latest_start = 0;
sf->sf_time_last_checkpoint = 0;
sf->sf_items_checked = 0;
sf->sf_items_updated = 0;
sf->sf_items_failed = 0;
- sf->sf_items_updated_prior = 0;
+ if (!scrub->os_in_join)
+ sf->sf_items_updated_prior = 0;
+
sf->sf_items_noscrub = 0;
sf->sf_items_igif = 0;
}
static int osd_scrub_file_load(struct osd_scrub *scrub)
{
loff_t pos = 0;
- char *name = LDISKFS_SB(osd_scrub2sb(scrub))->s_es->s_volume_name;
int len = sizeof(scrub->os_file_disk);
int rc;
osd_scrub_file_to_cpu(sf, &scrub->os_file_disk);
if (sf->sf_magic != SCRUB_MAGIC_V1) {
- CWARN("%.16s: invalid scrub magic 0x%x != 0x%x\n,",
- name, sf->sf_magic, SCRUB_MAGIC_V1);
+ CDEBUG(D_LFSCK, "%.16s: invalid scrub magic "
+ "0x%x != 0x%x\n", osd_scrub2name(scrub),
+ sf->sf_magic, SCRUB_MAGIC_V1);
/* Process it as new scrub file. */
rc = -ENOENT;
} else {
rc = 0;
}
} else if (rc != 0) {
- CERROR("%.16s: fail to load scrub file, expected = %d, "
- "rc = %d\n", name, len, rc);
+ CDEBUG(D_LFSCK, "%.16s: fail to load scrub file, "
+ "expected = %d: rc = %d\n",
+ osd_scrub2name(scrub), len, rc);
if (rc > 0)
rc = -EFAULT;
} else {
jh = osd_journal_start_sb(osd_sb(dev), LDISKFS_HT_MISC, credits);
if (IS_ERR(jh)) {
rc = PTR_ERR(jh);
- CERROR("%.16s: fail to start trans for scrub store, rc = %d\n",
- LDISKFS_SB(osd_scrub2sb(scrub))->s_es->s_volume_name,rc);
+ CDEBUG(D_LFSCK, "%.16s: fail to start trans for scrub store: "
+ "rc = %d\n", osd_scrub2name(scrub), rc);
return rc;
}
len, 0, &pos, jh);
ldiskfs_journal_stop(jh);
if (rc != 0)
- CERROR("%.16s: fail to store scrub file, expected = %d, "
- "rc = %d\n",
- LDISKFS_SB(osd_scrub2sb(scrub))->s_es->s_volume_name,
- len, rc);
+ CDEBUG(D_LFSCK, "%.16s: fail to store scrub file, "
+ "expected = %d: rc = %d\n",
+ osd_scrub2name(scrub), len, rc);
+
scrub->os_time_last_checkpoint = cfs_time_current();
scrub->os_time_next_checkpoint = scrub->os_time_last_checkpoint +
cfs_time_seconds(SCRUB_CHECKPOINT_INTERVAL);
{
struct filter_fid_old *ff = &info->oti_ff;
struct dentry *dentry = &info->oti_obj_dentry;
+ struct lu_fid *tfid = &info->oti_fid;
handle_t *jh;
int size = 0;
int rc;
if (dev->od_scrub.os_file.sf_param & SP_DRYRUN)
RETURN(0);
+ if (fid_is_idif(fid) && dev->od_index_in_idif == 0) {
+ struct ost_id *oi = &info->oti_ostid;
+
+ fid_to_ostid(fid, oi);
+ ostid_to_fid(tfid, oi, 0);
+ } else {
+ *tfid = *fid;
+ }
+
/* We want the LMA to fit into the 256-byte OST inode, so operate
* as following:
* 1) read old XATTR_NAME_FID and save the parent FID;
osd_dto_credits_noquota[DTO_XATTR_SET] * 3);
if (IS_ERR(jh)) {
rc = PTR_ERR(jh);
- CERROR("%s: fail to start trans for convert ff: "DFID
- ": rc = %d\n",
- osd_name(dev), PFID(fid), rc);
+ CDEBUG(D_LFSCK, "%s: fail to start trans for convert ff "
+ DFID": rc = %d\n", osd_name(dev), PFID(tfid), rc);
RETURN(rc);
}
}
/* 3) make new LMA and add it */
- rc = osd_ea_fid_set(info, inode, fid, LMAC_FID_ON_OST, 0);
+ rc = osd_ea_fid_set(info, inode, tfid, LMAC_FID_ON_OST, 0);
if (rc == 0 && reset)
size = sizeof(struct filter_fid);
else if (rc != 0 && removed)
stop:
ldiskfs_journal_stop(jh);
+ if (rc < 0)
+ CDEBUG(D_LFSCK, "%s: fail to convert ff "DFID": rc = %d\n",
+ osd_name(dev), PFID(tfid), rc);
return rc;
}
GOTO(out, rc = val);
if (scrub->os_in_prior)
- oii = cfs_list_entry(oic, struct osd_inconsistent_item,
- oii_cache);
+ oii = list_entry(oic, struct osd_inconsistent_item,
+ oii_cache);
if (lid->oii_ino < sf->sf_pos_latest_start && oii == NULL)
GOTO(out, rc = 0);
GOTO(out, rc);
}
+ /* The inode has been reused as EA inode, ignore it. */
+ if (unlikely(osd_is_ea_inode(inode)))
+ GOTO(out, rc = 0);
+
sf->sf_flags |= SF_UPGRADE;
sf->sf_internal_flags &= ~SIF_NO_HANDLE_OLD_FID;
dev->od_check_ff = 1;
(!scrub->os_convert_igif || OBD_FAIL_CHECK(OBD_FAIL_FID_NOLMA)))
GOTO(out, rc = 0);
- if ((oii != NULL && oii->oii_insert) || (val == SCRUB_NEXT_NOLMA))
+ if ((oii != NULL && oii->oii_insert) || (val == SCRUB_NEXT_NOLMA)) {
+ ops = DTO_INDEX_INSERT;
+
goto iget;
+ }
rc = osd_oi_lookup(info, dev, fid, lid2,
(val == SCRUB_NEXT_OSTOBJ ||
val == SCRUB_NEXT_OSTOBJ_OLD) ? OI_KNOWN_ON_OST : 0);
if (rc != 0) {
- if (rc != -ENOENT && rc != -ESTALE)
+ if (rc == -ENOENT)
+ ops = DTO_INDEX_INSERT;
+ else if (rc != -ESTALE)
GOTO(out, rc);
iget:
rc = 0;
GOTO(out, rc);
}
+
+ /* The inode has been reused as EA inode, ignore it. */
+ if (unlikely(osd_is_ea_inode(inode)))
+ GOTO(out, rc = 0);
}
- scrub->os_full_speed = 1;
- ops = DTO_INDEX_INSERT;
+ if (!scrub->os_partial_scan)
+ scrub->os_full_speed = 1;
+
idx = osd_oi_fid2idx(dev, fid);
switch (val) {
case SCRUB_NEXT_NOLMA:
GOTO(out, rc = 0);
} else {
- scrub->os_full_speed = 1;
+ if (!scrub->os_partial_scan)
+ scrub->os_full_speed = 1;
+
sf->sf_flags |= SF_INCONSISTENT;
/* XXX: If the device is restored from file-level backup, then
sf->sf_items_updated_prior++;
else
sf->sf_items_updated++;
-
- /* The target has been changed, need to be re-loaded. */
- lu_object_purge(info->oti_env, osd2lu_dev(dev), fid);
}
GOTO(out, rc);
/* There may be conflict unlink during the OI scrub,
* if happend, then remove the new added OI mapping. */
if (ops == DTO_INDEX_INSERT && inode != NULL && !IS_ERR(inode) &&
- unlikely(inode->i_nlink == 0))
+ unlikely(ldiskfs_test_inode_state(inode,
+ LDISKFS_STATE_LUSTRE_DESTROY)))
osd_scrub_refresh_mapping(info, dev, fid, lid,
DTO_INDEX_DELETE, false,
(val == SCRUB_NEXT_OSTOBJ ||
iput(inode);
if (oii != NULL) {
- LASSERT(!cfs_list_empty(&oii->oii_list));
+ LASSERT(list_empty(&oii->oii_list));
- spin_lock(&scrub->os_lock);
- cfs_list_del_init(&oii->oii_list);
- spin_unlock(&scrub->os_lock);
OBD_FREE_PTR(oii);
}
+
RETURN(sf->sf_param & SP_FAILOUT ? rc : 0);
}
bool drop_dryrun = false;
ENTRY;
+ CDEBUG(D_LFSCK, "%.16s: OI scrub prep, flags = 0x%x\n",
+ osd_scrub2name(scrub), flags);
+
down_write(&scrub->os_rwsem);
if (flags & SS_SET_FAILOUT)
sf->sf_param |= SP_FAILOUT;
-
- if (flags & SS_CLEAR_FAILOUT)
+ else if (flags & SS_CLEAR_FAILOUT)
sf->sf_param &= ~SP_FAILOUT;
- if (flags & SS_SET_DRYRUN)
+ if (flags & SS_SET_DRYRUN) {
sf->sf_param |= SP_DRYRUN;
-
- if (flags & SS_CLEAR_DRYRUN && sf->sf_param & SP_DRYRUN) {
+ } else if (flags & SS_CLEAR_DRYRUN && sf->sf_param & SP_DRYRUN) {
sf->sf_param &= ~SP_DRYRUN;
drop_dryrun = true;
}
osd_scrub_file_reset(scrub,
LDISKFS_SB(osd_sb(dev))->s_es->s_uuid, 0);
- if (flags & SS_AUTO) {
+ if (flags & SS_AUTO_FULL) {
scrub->os_full_speed = 1;
+ scrub->os_partial_scan = 0;
sf->sf_flags |= SF_AUTO;
- /* For the case of OI scrub auto triggered, NOT dryrun. */
- sf->sf_param &= ~SP_FAILOUT;
+ } else if (flags & SS_AUTO_PARTIAL) {
+ scrub->os_full_speed = 0;
+ scrub->os_partial_scan = 1;
+ sf->sf_flags |= SF_AUTO;
+ } else if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT |
+ SF_UPGRADE)) {
+ scrub->os_full_speed = 1;
+ scrub->os_partial_scan = 0;
} else {
scrub->os_full_speed = 0;
+ scrub->os_partial_scan = 0;
}
- if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE))
- scrub->os_full_speed = 1;
-
- scrub->os_in_prior = 0;
spin_lock(&scrub->os_lock);
+ scrub->os_in_prior = 0;
scrub->os_waiting = 0;
scrub->os_paused = 0;
+ scrub->os_in_join = 0;
+ scrub->os_full_scrub = 0;
spin_unlock(&scrub->os_lock);
scrub->os_new_checked = 0;
if (drop_dryrun && sf->sf_pos_first_inconsistent != 0)
sf->sf_status = SS_SCANNING;
sf->sf_time_latest_start = cfs_time_current_sec();
sf->sf_time_last_checkpoint = sf->sf_time_latest_start;
+ sf->sf_pos_last_checkpoint = sf->sf_pos_latest_start - 1;
rc = osd_scrub_file_store(scrub);
if (rc == 0) {
spin_lock(&scrub->os_lock);
return rc;
}
-static void osd_scrub_post(struct osd_scrub *scrub, int result)
+static int osd_scrub_post(struct osd_scrub *scrub, int result)
{
struct scrub_file *sf = &scrub->os_file;
+ int rc;
ENTRY;
+ CDEBUG(D_LFSCK, "%.16s: OI scrub post, result = %d\n",
+ osd_scrub2name(scrub), result);
+
down_write(&scrub->os_rwsem);
spin_lock(&scrub->os_lock);
thread_set_flags(&scrub->os_thread, SVC_STOPPING);
}
sf->sf_run_time += cfs_duration_sec(cfs_time_current() + HALF_SEC -
scrub->os_time_last_checkpoint);
- result = osd_scrub_file_store(scrub);
- if (result < 0)
- CERROR("%.16s: fail to osd_scrub_post, rc = %d\n",
- LDISKFS_SB(osd_scrub2sb(scrub))->s_es->s_volume_name,
- result);
+ rc = osd_scrub_file_store(scrub);
up_write(&scrub->os_rwsem);
- EXIT;
+ RETURN(rc < 0 ? rc : result);
}
/* iteration engine */
struct osd_device *dev,
struct osd_iit_param *param,
struct osd_idmap_cache **oic,
- int noslot);
+ const bool noslot);
typedef int (*osd_iit_exec_policy)(struct osd_thread_info *info,
struct osd_device *dev,
struct osd_iit_param *param,
struct osd_idmap_cache *oic,
- int *noslot, int rc);
+ bool *noslot, int rc);
static int osd_iit_next(struct osd_iit_param *param, __u32 *pos)
{
int rc;
ENTRY;
+ /* Not handle the backend root object and agent parent object.
+ * They are neither visible to namespace nor have OI mappings. */
+ if (unlikely(pos == osd_sb(dev)->s_root->d_inode->i_ino ||
+ pos == osd_remote_parent_ino(dev)))
+ RETURN(SCRUB_NEXT_CONTINUE);
+
osd_id_gen(lid, pos, OSD_OII_NOGEN);
inode = osd_iget(info, dev, lid);
if (IS_ERR(inode)) {
if (rc == -ENOENT || rc == -ESTALE)
RETURN(SCRUB_NEXT_CONTINUE);
- CERROR("%.16s: fail to read inode, ino# = %u, rc = %d\n",
- LDISKFS_SB(sb)->s_es->s_volume_name, pos, rc);
+ CDEBUG(D_LFSCK, "%.16s: fail to read inode, ino# = %u: "
+ "rc = %d\n", LDISKFS_SB(sb)->s_es->s_volume_name,
+ pos, rc);
RETURN(rc);
}
+ /* It is an EA inode, no OI mapping for it, skip it. */
+ if (osd_is_ea_inode(inode))
+ GOTO(put, rc = SCRUB_NEXT_CONTINUE);
+
if (scrub &&
ldiskfs_test_inode_state(inode, LDISKFS_STATE_LUSTRE_NOSCRUB)) {
/* Only skip it for the first OI scrub accessing. */
static int osd_scrub_next(struct osd_thread_info *info, struct osd_device *dev,
struct osd_iit_param *param,
- struct osd_idmap_cache **oic, int noslot)
+ struct osd_idmap_cache **oic, const bool noslot)
{
struct osd_scrub *scrub = &dev->od_scrub;
struct ptlrpc_thread *thread = &scrub->os_thread;
struct l_wait_info lwi;
lwi = LWI_TIMEOUT(cfs_time_seconds(cfs_fail_val), NULL, NULL);
- l_wait_event(thread->t_ctl_waitq,
- !cfs_list_empty(&scrub->os_inconsistent_items) ||
- !thread_is_running(thread),
- &lwi);
+ if (likely(lwi.lwi_timeout > 0))
+ l_wait_event(thread->t_ctl_waitq,
+ !list_empty(&scrub->os_inconsistent_items) ||
+ !thread_is_running(thread),
+ &lwi);
}
if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_CRASH)) {
if (unlikely(!thread_is_running(thread)))
return SCRUB_NEXT_EXIT;
- if (!cfs_list_empty(&scrub->os_inconsistent_items)) {
- struct osd_inconsistent_item *oii;
+ if (!list_empty(&scrub->os_inconsistent_items)) {
+ spin_lock(&scrub->os_lock);
+ if (likely(!list_empty(&scrub->os_inconsistent_items))) {
+ struct osd_inconsistent_item *oii;
- oii = cfs_list_entry(scrub->os_inconsistent_items.next,
- struct osd_inconsistent_item, oii_list);
- *oic = &oii->oii_cache;
- scrub->os_in_prior = 1;
- return 0;
+ oii = list_entry(scrub->os_inconsistent_items.next,
+ struct osd_inconsistent_item, oii_list);
+ list_del_init(&oii->oii_list);
+ spin_unlock(&scrub->os_lock);
+
+ *oic = &oii->oii_cache;
+ scrub->os_in_prior = 1;
+
+ return 0;
+ }
+ spin_unlock(&scrub->os_lock);
}
- if (noslot != 0)
+ if (noslot)
return SCRUB_NEXT_WAIT;
rc = osd_iit_next(param, &scrub->os_pos_current);
static int osd_preload_next(struct osd_thread_info *info,
struct osd_device *dev, struct osd_iit_param *param,
- struct osd_idmap_cache **oic, int noslot)
+ struct osd_idmap_cache **oic, const bool noslot)
{
struct osd_otable_cache *ooc = &dev->od_otable_it->ooi_cache;
struct osd_scrub *scrub;
{
spin_lock(&scrub->os_lock);
if (osd_scrub_has_window(scrub, &it->ooi_cache) ||
- !cfs_list_empty(&scrub->os_inconsistent_items) ||
+ !list_empty(&scrub->os_inconsistent_items) ||
it->ooi_waiting || !thread_is_running(&scrub->os_thread))
scrub->os_waiting = 0;
else
static int osd_scrub_exec(struct osd_thread_info *info, struct osd_device *dev,
struct osd_iit_param *param,
- struct osd_idmap_cache *oic, int *noslot, int rc)
+ struct osd_idmap_cache *oic, bool *noslot, int rc)
{
struct l_wait_info lwi = { 0 };
struct osd_scrub *scrub = &dev->od_scrub;
}
rc = osd_scrub_check_update(info, dev, oic, rc);
- if (rc != 0)
+ if (rc != 0) {
+ scrub->os_in_prior = 0;
return rc;
+ }
rc = osd_scrub_checkpoint(scrub);
if (rc != 0) {
- CERROR("%.16s: fail to checkpoint, pos = %u, rc = %d\n",
- LDISKFS_SB(param->sb)->s_es->s_volume_name,
+ CDEBUG(D_LFSCK, "%.16s: fail to checkpoint, pos = %u: "
+ "rc = %d\n", osd_scrub2name(scrub),
scrub->os_pos_current, rc);
/* Continue, as long as the scrub itself can go ahead. */
}
if (scrub->os_full_speed || rc == SCRUB_NEXT_CONTINUE)
return 0;
- if (osd_scrub_has_window(scrub, ooc)) {
- *noslot = 0;
+ if (ooc != NULL && osd_scrub_has_window(scrub, ooc)) {
+ *noslot = false;
return 0;
}
- l_wait_event(thread->t_ctl_waitq,
- osd_scrub_wakeup(scrub, it),
- &lwi);
+ if (it != NULL)
+ l_wait_event(thread->t_ctl_waitq, osd_scrub_wakeup(scrub, it),
+ &lwi);
- if (osd_scrub_has_window(scrub, ooc))
- *noslot = 0;
+ if (ooc != NULL && osd_scrub_has_window(scrub, ooc))
+ *noslot = false;
else
- *noslot = 1;
+ *noslot = true;
return 0;
}
static int osd_preload_exec(struct osd_thread_info *info,
struct osd_device *dev, struct osd_iit_param *param,
- struct osd_idmap_cache *oic, int *noslot, int rc)
+ struct osd_idmap_cache *oic, bool *noslot, int rc)
{
struct osd_otable_cache *ooc = &dev->od_otable_it->ooi_cache;
#define SCRUB_IT_ALL 1
#define SCRUB_IT_CRASH 2
+static void osd_scrub_join(struct osd_device *dev, __u32 flags,
+ bool inconsistent)
+{
+ struct osd_scrub *scrub = &dev->od_scrub;
+ struct ptlrpc_thread *thread = &scrub->os_thread;
+ struct scrub_file *sf = &scrub->os_file;
+ int rc;
+ ENTRY;
+
+ LASSERT(!(flags & SS_AUTO_PARTIAL));
+
+ down_write(&scrub->os_rwsem);
+ scrub->os_in_join = 1;
+ if (flags & SS_SET_FAILOUT)
+ sf->sf_param |= SP_FAILOUT;
+ else if (flags & SS_CLEAR_FAILOUT)
+ sf->sf_param &= ~SP_FAILOUT;
+
+ if (flags & SS_SET_DRYRUN)
+ sf->sf_param |= SP_DRYRUN;
+ else if (flags & SS_CLEAR_DRYRUN)
+ sf->sf_param &= ~SP_DRYRUN;
+
+ if (flags & SS_RESET) {
+ osd_scrub_file_reset(scrub,
+ LDISKFS_SB(osd_sb(dev))->s_es->s_uuid,
+ inconsistent ? SF_INCONSISTENT : 0);
+ sf->sf_status = SS_SCANNING;
+ }
+
+ if (flags & SS_AUTO_FULL) {
+ sf->sf_flags |= SF_AUTO;
+ scrub->os_full_speed = 1;
+ }
+
+ if (sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT | SF_UPGRADE))
+ scrub->os_full_speed = 1;
+ else
+ scrub->os_full_speed = 0;
+
+ scrub->os_new_checked = 0;
+ if (sf->sf_pos_last_checkpoint != 0)
+ sf->sf_pos_latest_start = sf->sf_pos_last_checkpoint + 1;
+ else
+ sf->sf_pos_latest_start = LDISKFS_FIRST_INO(osd_sb(dev)) + 1;
+
+ scrub->os_pos_current = sf->sf_pos_latest_start;
+ sf->sf_time_latest_start = cfs_time_current_sec();
+ sf->sf_time_last_checkpoint = sf->sf_time_latest_start;
+ sf->sf_pos_last_checkpoint = sf->sf_pos_latest_start - 1;
+ rc = osd_scrub_file_store(scrub);
+ if (rc != 0)
+ CDEBUG(D_LFSCK, "%.16s: fail to store scrub file when join "
+ "the OI scrub: rc = %d\n", osd_scrub2name(scrub), rc);
+
+ spin_lock(&scrub->os_lock);
+ scrub->os_waiting = 0;
+ scrub->os_paused = 0;
+ scrub->os_partial_scan = 0;
+ scrub->os_in_join = 0;
+ scrub->os_full_scrub = 0;
+ spin_unlock(&scrub->os_lock);
+ wake_up_all(&thread->t_ctl_waitq);
+ up_write(&scrub->os_rwsem);
+
+ EXIT;
+}
+
static int osd_inode_iteration(struct osd_thread_info *info,
struct osd_device *dev, __u32 max, bool preload)
{
+ struct osd_scrub *scrub = &dev->od_scrub;
+ struct ptlrpc_thread *thread = &scrub->os_thread;
+ struct scrub_file *sf = &scrub->os_file;
osd_iit_next_policy next;
osd_iit_exec_policy exec;
__u32 *pos;
__u32 *count;
- struct osd_iit_param param;
+ struct osd_iit_param param = { NULL };
+ struct l_wait_info lwi = { 0 };
__u32 limit;
- int noslot = 0;
int rc;
+ bool noslot = true;
ENTRY;
+ param.sb = osd_sb(dev);
+ if (preload)
+ goto full;
+
+ while (scrub->os_partial_scan && !scrub->os_in_join) {
+ struct osd_idmap_cache *oic = NULL;
+
+ rc = osd_scrub_next(info, dev, ¶m, &oic, noslot);
+ switch (rc) {
+ case SCRUB_NEXT_EXIT:
+ RETURN(0);
+ case SCRUB_NEXT_CRASH:
+ RETURN(SCRUB_IT_CRASH);
+ case SCRUB_NEXT_FATAL:
+ RETURN(-EINVAL);
+ case SCRUB_NEXT_WAIT: {
+ struct kstatfs *ksfs = &info->oti_ksfs;
+ __u64 saved_flags;
+
+ if (dev->od_full_scrub_ratio == OFSR_NEVER ||
+ unlikely(sf->sf_items_updated_prior == 0))
+ goto wait;
+
+ if (dev->od_full_scrub_ratio == OFSR_DIRECTLY ||
+ scrub->os_full_scrub) {
+ osd_scrub_join(dev, SS_AUTO_FULL | SS_RESET,
+ true);
+ goto full;
+ }
+
+ rc = param.sb->s_op->statfs(param.sb->s_root, ksfs);
+ if (rc == 0) {
+ __u64 used = ksfs->f_files - ksfs->f_ffree;
+
+ do_div(used, sf->sf_items_updated_prior);
+ /* If we hit too much inconsistent OI
+ * mappings during the partial scan,
+ * then scan the device completely. */
+ if (used < dev->od_full_scrub_ratio) {
+ osd_scrub_join(dev,
+ SS_AUTO_FULL | SS_RESET, true);
+ goto full;
+ }
+ }
+
+wait:
+ if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_DELAY) &&
+ cfs_fail_val > 0)
+ continue;
+
+ saved_flags = sf->sf_flags;
+ sf->sf_flags &= ~(SF_RECREATED | SF_INCONSISTENT |
+ SF_UPGRADE | SF_AUTO);
+ sf->sf_status = SS_COMPLETED;
+ l_wait_event(thread->t_ctl_waitq,
+ !thread_is_running(thread) ||
+ !scrub->os_partial_scan ||
+ scrub->os_in_join ||
+ !list_empty(&scrub->os_inconsistent_items),
+ &lwi);
+ sf->sf_flags = saved_flags;
+ sf->sf_status = SS_SCANNING;
+
+ if (unlikely(!thread_is_running(thread)))
+ RETURN(0);
+
+ if (!scrub->os_partial_scan || scrub->os_in_join)
+ goto full;
+
+ continue;
+ }
+ default:
+ LASSERTF(rc == 0, "rc = %d\n", rc);
+
+ osd_scrub_exec(info, dev, ¶m, oic, &noslot, rc);
+ break;
+ }
+ }
+
+full:
if (!preload) {
- struct osd_scrub *scrub = &dev->od_scrub;
+ l_wait_event(thread->t_ctl_waitq,
+ !thread_is_running(thread) || !scrub->os_in_join,
+ &lwi);
+
+ if (unlikely(!thread_is_running(thread)))
+ RETURN(0);
+ }
+ noslot = false;
+ if (!preload) {
next = osd_scrub_next;
exec = osd_scrub_exec;
pos = &scrub->os_pos_current;
pos = &ooc->ooc_pos_preload;
count = &ooc->ooc_cached_items;
}
- param.sb = osd_sb(dev);
limit = le32_to_cpu(LDISKFS_SB(param.sb)->s_es->s_inodes_count);
while (*pos <= limit && *count < max) {
struct osd_idmap_cache *oic = NULL;
+ struct ldiskfs_group_desc *desc;
param.bg = (*pos - 1) / LDISKFS_INODES_PER_GROUP(param.sb);
+ desc = ldiskfs_get_group_desc(param.sb, param.bg, NULL);
+ if (desc == NULL)
+ RETURN(-EIO);
+
+ ldiskfs_lock_group(param.sb, param.bg);
+ if (desc->bg_flags & cpu_to_le16(LDISKFS_BG_INODE_UNINIT)) {
+ ldiskfs_unlock_group(param.sb, param.bg);
+ *pos = 1 + (param.bg + 1) *
+ LDISKFS_INODES_PER_GROUP(param.sb);
+ continue;
+ }
+ ldiskfs_unlock_group(param.sb, param.bg);
+
param.offset = (*pos - 1) % LDISKFS_INODES_PER_GROUP(param.sb);
param.gbase = 1 + param.bg * LDISKFS_INODES_PER_GROUP(param.sb);
param.bitmap = ldiskfs_read_inode_bitmap(param.sb, param.bg);
if (param.bitmap == NULL) {
- CERROR("%.16s: fail to read bitmap for %u, "
+ CDEBUG(D_LFSCK, "%.16s: fail to read bitmap for %u, "
"scrub will stop, urgent mode\n",
- LDISKFS_SB(param.sb)->s_es->s_volume_name,
- (__u32)param.bg);
+ osd_scrub2name(scrub), (__u32)param.bg);
RETURN(-EIO);
}
while (param.offset < LDISKFS_INODES_PER_GROUP(param.sb) &&
*count < max) {
+ if (param.offset +
+ ldiskfs_itable_unused_count(param.sb, desc) >
+ LDISKFS_INODES_PER_GROUP(param.sb))
+ goto next_group;
+
rc = next(info, dev, ¶m, &oic, noslot);
switch (rc) {
case SCRUB_NEXT_BREAK:
if (rc == SCRUB_IT_ALL)
it->ooi_all_cached = 1;
- CDEBUG(D_LFSCK, "OSD pre-loaded: max = %u, preload = %u, rc = %d\n",
- le32_to_cpu(LDISKFS_SB(osd_sb(dev))->s_es->s_inodes_count),
- ooc->ooc_pos_preload, rc);
-
if (scrub->os_waiting && osd_scrub_has_window(scrub, ooc)) {
spin_lock(&scrub->os_lock);
scrub->os_waiting = 0;
struct osd_device *dev = (struct osd_device *)args;
struct osd_scrub *scrub = &dev->od_scrub;
struct ptlrpc_thread *thread = &scrub->os_thread;
- struct super_block *sb = osd_sb(dev);
int rc;
ENTRY;
rc = lu_env_init(&env, LCT_LOCAL);
if (rc != 0) {
- CERROR("%.16s: OI scrub, fail to init env, rc = %d\n",
- LDISKFS_SB(sb)->s_es->s_volume_name, rc);
+ CDEBUG(D_LFSCK, "%.16s: OI scrub fail to init env: rc = %d\n",
+ osd_scrub2name(scrub), rc);
GOTO(noenv, rc);
}
rc = osd_scrub_prep(dev);
if (rc != 0) {
- CERROR("%.16s: OI scrub, fail to scrub prep, rc = %d\n",
- LDISKFS_SB(sb)->s_es->s_volume_name, rc);
+ CDEBUG(D_LFSCK, "%.16s: OI scrub fail to scrub prep: rc = %d\n",
+ osd_scrub2name(scrub), rc);
GOTO(out, rc);
}
- if (!scrub->os_full_speed) {
+ if (!scrub->os_full_speed && !scrub->os_partial_scan) {
struct l_wait_info lwi = { 0 };
struct osd_otable_it *it = dev->od_otable_it;
struct osd_otable_cache *ooc = &it->ooi_cache;
scrub->os_pos_current = ooc->ooc_pos_preload;
}
- CDEBUG(D_LFSCK, "OI scrub: flags = 0x%x, pos = %u\n",
- scrub->os_start_flags, scrub->os_pos_current);
+ CDEBUG(D_LFSCK, "%.16s: OI scrub start, flags = 0x%x, pos = %u\n",
+ osd_scrub2name(scrub), scrub->os_start_flags,
+ scrub->os_pos_current);
rc = osd_inode_iteration(osd_oti_get(&env), dev, ~0U, false);
if (unlikely(rc == SCRUB_IT_CRASH))
GOTO(post, rc);
post:
- osd_scrub_post(scrub, rc);
- CDEBUG(D_LFSCK, "OI scrub: stop, rc = %d, pos = %u\n",
- rc, scrub->os_pos_current);
+ rc = osd_scrub_post(scrub, rc);
+ CDEBUG(D_LFSCK, "%.16s: OI scrub: stop, pos = %u: rc = %d\n",
+ osd_scrub2name(scrub), scrub->os_pos_current, rc);
out:
- while (!cfs_list_empty(&scrub->os_inconsistent_items)) {
+ while (!list_empty(&scrub->os_inconsistent_items)) {
struct osd_inconsistent_item *oii;
- oii = cfs_list_entry(scrub->os_inconsistent_items.next,
+ oii = list_entry(scrub->os_inconsistent_items.next,
struct osd_inconsistent_item, oii_list);
- cfs_list_del_init(&oii->oii_list);
+ list_del_init(&oii->oii_list);
OBD_FREE_PTR(oii);
}
lu_env_fini(&env);
loff_t offset, __u64 ino, unsigned d_type);
static int osd_ios_dl_fill(void *buf, const char *name, int namelen,
loff_t offset, __u64 ino, unsigned d_type);
+static int osd_ios_uld_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,
OLF_HIDE_FID = 0x0002,
OLF_SHOW_NAME = 0x0004,
OLF_NO_OI = 0x0008,
+ OLF_IDX_IN_FID = 0x0010,
};
struct osd_lf_map {
char *olm_name;
struct lu_fid olm_fid;
__u16 olm_flags;
+ __u16 olm_namelen;
scandir_t olm_scandir;
filldir_t olm_filldir;
};
static const struct osd_lf_map osd_lf_maps[] = {
/* CATALOGS */
{ CATLIST, { FID_SEQ_LOCAL_FILE, LLOG_CATALOGS_OID, 0 }, OLF_SHOW_NAME,
- NULL, NULL },
+ sizeof(CATLIST) - 1, 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 },
+ OLF_SCAN_SUBITEMS, sizeof(MOUNT_CONFIGS_DIR) - 1,
+ 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 },
+ sizeof(MGS_NIDTBL_DIR) - 1, osd_ios_general_scan,
+ osd_ios_varfid_fill },
/* PENDING */
- { "PENDING", { 0, 0, 0 }, 0, NULL, NULL },
+ { "PENDING", { 0, 0, 0 }, 0, sizeof("PENDING") - 1, NULL, NULL },
/* ROOT */
- { "ROOT", { FID_SEQ_ROOT, 1, 0 },
- OLF_SCAN_SUBITEMS | OLF_HIDE_FID, osd_ios_ROOT_scan, NULL },
+ { "ROOT", { FID_SEQ_ROOT, FID_OID_ROOT, 0 },
+ OLF_SCAN_SUBITEMS | OLF_HIDE_FID, sizeof("ROOT") - 1,
+ osd_ios_ROOT_scan, NULL },
/* changelog_catalog */
- { CHANGELOG_CATALOG, { 0, 0, 0 }, 0, NULL, NULL },
+ { CHANGELOG_CATALOG, { 0, 0, 0 }, 0, sizeof(CHANGELOG_CATALOG) - 1,
+ NULL, NULL },
/* changelog_users */
- { CHANGELOG_USERS, { 0, 0, 0 }, 0, NULL, NULL },
+ { CHANGELOG_USERS, { 0, 0, 0 }, 0, sizeof(CHANGELOG_USERS) - 1,
+ NULL, NULL },
/* fld */
{ "fld", { FID_SEQ_LOCAL_FILE, FLD_INDEX_OID, 0 }, OLF_SHOW_NAME,
- NULL, NULL },
+ sizeof("fld") - 1, NULL, NULL },
/* last_rcvd */
{ LAST_RCVD, { FID_SEQ_LOCAL_FILE, LAST_RECV_OID, 0 }, OLF_SHOW_NAME,
- NULL, NULL },
+ sizeof(LAST_RCVD) - 1, NULL, NULL },
- /* lfsck_bookmark */
- { "lfsck_bookmark", { 0, 0, 0 }, 0, NULL, NULL },
+ /* reply_data */
+ { REPLY_DATA, { FID_SEQ_LOCAL_FILE, REPLY_DATA_OID, 0 }, OLF_SHOW_NAME,
+ sizeof(REPLY_DATA) - 1, NULL, NULL },
/* lov_objid */
{ LOV_OBJID, { FID_SEQ_LOCAL_FILE, MDD_LOV_OBJ_OID, 0 }, OLF_SHOW_NAME,
- NULL, NULL },
+ sizeof(LOV_OBJID) - 1, NULL, NULL },
/* lov_objseq */
{ LOV_OBJSEQ, { FID_SEQ_LOCAL_FILE, MDD_LOV_OBJ_OSEQ, 0 },
- OLF_SHOW_NAME, NULL, NULL },
+ OLF_SHOW_NAME, sizeof(LOV_OBJSEQ) - 1, NULL, NULL },
/* quota_master */
- { QMT_DIR, { 0, 0, 0 }, OLF_SCAN_SUBITEMS,
+ { QMT_DIR, { 0, 0, 0 }, OLF_SCAN_SUBITEMS, sizeof(QMT_DIR) - 1,
osd_ios_general_scan, osd_ios_varfid_fill },
/* quota_slave */
- { QSD_DIR, { 0, 0, 0 }, OLF_SCAN_SUBITEMS,
+ { QSD_DIR, { 0, 0, 0 }, OLF_SCAN_SUBITEMS, sizeof(QSD_DIR) - 1,
osd_ios_general_scan, osd_ios_varfid_fill },
/* seq_ctl */
{ "seq_ctl", { FID_SEQ_LOCAL_FILE, FID_SEQ_CTL_OID, 0 },
- OLF_SHOW_NAME, NULL, NULL },
+ OLF_SHOW_NAME, sizeof("seq_ctl") - 1, NULL, NULL },
/* seq_srv */
{ "seq_srv", { FID_SEQ_LOCAL_FILE, FID_SEQ_SRV_OID, 0 },
- OLF_SHOW_NAME, NULL, NULL },
+ OLF_SHOW_NAME, sizeof("seq_srv") - 1, NULL, NULL },
/* health_check */
{ HEALTH_CHECK, { FID_SEQ_LOCAL_FILE, OFD_HEALTH_CHECK_OID, 0 },
- OLF_SHOW_NAME, NULL, NULL },
+ OLF_SHOW_NAME, sizeof(HEALTH_CHECK) - 1, NULL, NULL },
+
+ /* LFSCK */
+ { LFSCK_DIR, { 0, 0, 0 }, 0, sizeof(LFSCK_DIR) - 1,
+ osd_ios_general_scan, osd_ios_varfid_fill },
+
+ /* lfsck_bookmark */
+ { LFSCK_BOOKMARK, { 0, 0, 0 }, 0, sizeof(LFSCK_BOOKMARK) - 1,
+ NULL, NULL },
+
+ /* lfsck_layout */
+ { LFSCK_LAYOUT, { 0, 0, 0 }, 0, sizeof(LFSCK_LAYOUT) - 1,
+ NULL, NULL },
/* lfsck_namespace */
- { "lfsck_namespace", { 0, 0, 0 }, 0, NULL, NULL },
+ { LFSCK_NAMESPACE, { 0, 0, 0 }, 0, sizeof(LFSCK_NAMESPACE) - 1,
+ NULL, NULL },
/* OBJECTS, upgrade from old device */
- { OBJECTS, { 0, 0, 0 }, OLF_SCAN_SUBITEMS, osd_ios_OBJECTS_scan, NULL },
+ { OBJECTS, { 0, 0, 0 }, OLF_SCAN_SUBITEMS, sizeof(OBJECTS) - 1,
+ osd_ios_OBJECTS_scan, NULL },
/* lquota_v2.user, upgrade from old device */
- { "lquota_v2.user", { 0, 0, 0 }, 0, NULL, NULL },
+ { "lquota_v2.user", { 0, 0, 0 }, 0, sizeof("lquota_v2.user") - 1,
+ NULL, NULL },
/* lquota_v2.group, upgrade from old device */
- { "lquota_v2.group", { 0, 0, 0 }, 0, NULL, NULL },
+ { "lquota_v2.group", { 0, 0, 0 }, 0, sizeof("lquota_v2.group") - 1,
+ NULL, NULL },
/* LAST_GROUP, upgrade from old device */
{ "LAST_GROUP", { FID_SEQ_LOCAL_FILE, OFD_LAST_GROUP_OID, 0 },
- OLF_SHOW_NAME, NULL, NULL },
+ OLF_SHOW_NAME, sizeof("LAST_GROUP") - 1, NULL, NULL },
+
+ /* committed batchid for cross-MDT operation */
+ { "BATCHID", { FID_SEQ_LOCAL_FILE, BATCHID_COMMITTED_OID, 0 },
+ OLF_SHOW_NAME, sizeof("BATCHID") - 1, NULL, NULL },
- /* SLAVE_LOG, llog for destroy slave stripes of striped dir */
- { "SLAVE_LOG", { FID_SEQ_LOCAL_FILE, SLAVE_LLOG_CATALOGS_OID, 0 },
- OLF_SHOW_NAME, NULL, NULL },
+ /* OSP update logs update_log{_dir} use f_seq = FID_SEQ_UPDATE_LOG{_DIR}
+ * and f_oid = index for their log files. See lu_update_log{_dir}_fid()
+ * for more details. */
+
+ /* update_log */
+ { "update_log", { FID_SEQ_UPDATE_LOG, 0, 0 },
+ OLF_SHOW_NAME | OLF_IDX_IN_FID, sizeof("update_log") - 1,
+ NULL, NULL },
+
+ /* update_log_dir */
+ { "update_log_dir", { FID_SEQ_UPDATE_LOG_DIR, 0, 0 },
+ OLF_SHOW_NAME | OLF_SCAN_SUBITEMS | OLF_IDX_IN_FID,
+ sizeof("update_log_dir") - 1,
+ osd_ios_general_scan, osd_ios_uld_fill },
/* lost+found */
- { "lost+found", { 0, 0, 0 }, OLF_SCAN_SUBITEMS | OLF_NO_OI,
+ { "lost+found", { FID_SEQ_LOCAL_FILE, OSD_LPF_OID, 0 },
+ OLF_SCAN_SUBITEMS, sizeof("lost+found") - 1,
osd_ios_general_scan, osd_ios_lf_fill },
- { NULL, { 0, 0, 0 }, 0, NULL, NULL }
+ { NULL, { 0, 0, 0 }, 0, 0, NULL, NULL }
};
/* Add the new introduced files under .lustre/ in the list in the future. */
static const struct osd_lf_map osd_dl_maps[] = {
/* .lustre/fid */
{ "fid", { FID_SEQ_DOT_LUSTRE, FID_OID_DOT_LUSTRE_OBF, 0 }, 0,
- NULL, NULL },
+ sizeof("fid") - 1, NULL, NULL },
/* .lustre/lost+found */
{ "lost+found", { FID_SEQ_DOT_LUSTRE, FID_OID_DOT_LUSTRE_LPF, 0 }, 0,
- NULL, NULL },
+ sizeof("lost+found") - 1, NULL, NULL },
- { NULL, { 0, 0, 0 }, 0, NULL, NULL }
+ { NULL, { 0, 0, 0 }, 0, 0, NULL, NULL }
};
struct osd_ios_item {
- cfs_list_t oii_list;
+ struct list_head oii_list;
struct dentry *oii_dentry;
scandir_t oii_scandir;
filldir_t oii_filldir;
{
struct dentry *dentry;
- CDEBUG(D_LFSCK, "init lookup one: parent = %.*s, name = %.*s\n",
- parent->d_name.len, parent->d_name.name, namelen, name);
-
dentry = ll_lookup_one_len(name, parent, namelen);
- if (!IS_ERR(dentry) && dentry->d_inode == NULL) {
+ if (IS_ERR(dentry)) {
+ int rc = PTR_ERR(dentry);
+
+ if (rc != -ENOENT)
+ CERROR("Fail to find %.*s in %.*s (%lu/%u): rc = %d\n",
+ namelen, name, parent->d_name.len,
+ parent->d_name.name, parent->d_inode->i_ino,
+ parent->d_inode->i_generation, rc);
+
+ return dentry;
+ }
+
+ if (dentry->d_inode == NULL) {
dput(dentry);
return ERR_PTR(-ENOENT);
}
if (item == NULL)
RETURN(-ENOMEM);
- CFS_INIT_LIST_HEAD(&item->oii_list);
+ 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);
+ list_add_tail(&item->oii_list, &dev->od_ios_list);
RETURN(0);
}
int rc;
ENTRY;
- CDEBUG(D_LFSCK, "init scan one: ino = %ld\n", inode->i_ino);
-
rc = osd_get_lma(info, inode, &info->oti_obj_dentry, lma);
- if (rc != 0 && rc != -ENODATA)
+ if (rc != 0 && rc != -ENODATA) {
+ CDEBUG(D_LFSCK, "%s: fail to get lma for init OI scrub: "
+ "rc = %d\n", osd_name(dev), rc);
+
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)
+ if (fid == NULL || fid_is_zero(fid) || flags & OLF_HIDE_FID) {
lu_igif_build(&tfid, inode->i_ino, inode->i_generation);
- else
+ } else {
tfid = *fid;
+ if (flags & OLF_IDX_IN_FID) {
+ LASSERT(dev->od_index >= 0);
+
+ tfid.f_oid = dev->od_index;
+ }
+ }
rc = osd_ea_fid_set(info, inode, &tfid, 0, 0);
- if (rc != 0)
+ if (rc != 0) {
+ CDEBUG(D_LFSCK, "%s: fail to set LMA for init OI "
+ "scrub: rc = %d\n", osd_name(dev), rc);
+
RETURN(rc);
+ }
} else {
if (lma->lma_compat & LMAC_NOT_IN_OI)
RETURN(0);
scrub->os_lf_scanned++;
child = osd_ios_lookup_one_len(name, parent, namelen);
if (IS_ERR(child)) {
- CWARN("%s: cannot lookup child '%.*s': rc = %d\n",
+ CDEBUG(D_LFSCK, "%s: cannot lookup child '%.*s': rc = %d\n",
osd_name(dev), namelen, name, (int)PTR_ERR(child));
RETURN(0);
}
rc = osd_ios_new_item(dev, child, osd_ios_general_scan,
osd_ios_lf_fill);
if (rc != 0)
- CWARN("%s: cannot add child '%.*s': rc = %d\n",
- osd_name(dev), namelen, name, rc);
+ CDEBUG(D_LFSCK, "%s: cannot add child '%.*s': "
+ "rc = %d\n", osd_name(dev), namelen, name, rc);
GOTO(put, rc);
}
"/lost+found.\n", namelen, name, PFID(fid));
scrub->os_lf_repaired++;
} else {
- CWARN("%s: cannot rename for '%.*s' "DFID": rc = %d\n",
- osd_name(dev), namelen, name, PFID(fid), rc);
+ CDEBUG(D_LFSCK, "%s: cannot rename for '%.*s' "
+ DFID": rc = %d\n",
+ osd_name(dev), namelen, name, PFID(fid), rc);
}
}
RETURN(0);
for (map = osd_dl_maps; map->olm_name != NULL; map++) {
- if (strlen(map->olm_name) != namelen)
+ if (map->olm_namelen != namelen)
continue;
if (strncmp(map->olm_name, name, namelen) == 0)
RETURN(rc);
}
+static int osd_ios_uld_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 dentry *child;
+ struct lu_fid tfid;
+ int rc = 0;
+ ENTRY;
+
+ /* skip any non-DFID format name */
+ 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));
+
+ /* skip the start '[' */
+ sscanf(&name[1], SFID, RFID(&tfid));
+ if (fid_is_sane(&tfid))
+ rc = osd_ios_scan_one(fill_buf->oifb_info, fill_buf->oifb_dev,
+ child->d_inode, &tfid, 0);
+ else
+ rc = -EIO;
+ 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)
{
RETURN(0);
for (map = osd_lf_maps; map->olm_name != NULL; map++) {
- if (strlen(map->olm_name) != namelen)
+ if (map->olm_namelen != namelen)
continue;
if (strncmp(map->olm_name, name, namelen) == 0)
.oifb_info = info,
.oifb_dev = dev,
.oifb_dentry = dentry };
- struct file *filp = &info->oti_it_ea.oie_file;
+ struct file *filp = &info->oti_file;
struct inode *inode = dentry->d_inode;
const struct file_operations *fops = inode->i_fop;
int rc;
LASSERT(filldir != NULL);
filp->f_pos = 0;
- filp->f_dentry = dentry;
+ filp->f_path.dentry = dentry;
filp->f_mode = FMODE_64BITHASH;
filp->f_mapping = inode->i_mapping;
filp->f_op = fops;
if (rc != 0)
break;
- if (cfs_list_empty(&dev->od_ios_list))
+ if (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);
+ item = list_entry(dev->od_ios_list.next,
+ struct osd_ios_item, oii_list);
+ list_del_init(&item->oii_list);
LASSERT(item->oii_scandir != NULL);
scandir = item->oii_scandir;
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);
+ while (!list_empty(&dev->od_ios_list)) {
+ item = list_entry(dev->od_ios_list.next,
+ struct osd_ios_item, oii_list);
+ list_del_init(&item->oii_list);
dput(item->oii_dentry);
OBD_FREE_PTR(item);
}
child = osd_ios_lookup_one_len(map->olm_name,
osd_sb(dev)->s_root,
- strlen(map->olm_name));
+ map->olm_namelen);
if (!IS_ERR(child))
dput(child);
else if (PTR_ERR(child) == -ENOENT)
int rc;
ENTRY;
-again:
/* os_lock: sync status between stop and scrub thread */
spin_lock(&scrub->os_lock);
+
+again:
if (thread_is_running(thread)) {
spin_unlock(&scrub->os_lock);
- RETURN(-EALREADY);
- } else if (unlikely(thread_is_stopping(thread))) {
+ if (!(scrub->os_file.sf_flags & SF_AUTO) ||
+ (flags & (SS_AUTO_FULL | SS_AUTO_PARTIAL)))
+ RETURN(-EALREADY);
+
+ osd_scrub_join(dev, flags, false);
+ spin_lock(&scrub->os_lock);
+ if (!thread_is_running(thread))
+ goto again;
+
+ spin_unlock(&scrub->os_lock);
+ RETURN(0);
+ }
+
+ if (unlikely(thread_is_stopping(thread))) {
spin_unlock(&scrub->os_lock);
l_wait_event(thread->t_ctl_waitq,
thread_is_stopped(thread),
&lwi);
+ spin_lock(&scrub->os_lock);
goto again;
}
spin_unlock(&scrub->os_lock);
- if (scrub->os_file.sf_status == SS_COMPLETED)
+ if (scrub->os_file.sf_status == SS_COMPLETED) {
+ if (!(flags & SS_SET_FAILOUT))
+ flags |= SS_CLEAR_FAILOUT;
+
+ if (!(flags & SS_SET_DRYRUN))
+ flags |= SS_CLEAR_DRYRUN;
+
flags |= SS_RESET;
+ }
scrub->os_start_flags = flags;
thread_set_flags(thread, 0);
if (IS_ERR(task)) {
rc = PTR_ERR(task);
CERROR("%.16s: cannot start iteration thread: rc = %d\n",
- LDISKFS_SB(osd_sb(dev))->s_es->s_volume_name, rc);
+ osd_scrub2name(scrub), rc);
RETURN(rc);
}
RETURN(0);
}
-int osd_scrub_start(struct osd_device *dev)
+int osd_scrub_start(struct osd_device *dev, __u32 flags)
{
int rc;
ENTRY;
/* od_otable_mutex: prevent curcurrent start/stop */
mutex_lock(&dev->od_otable_mutex);
- rc = do_osd_scrub_start(dev, SS_AUTO);
+ rc = do_osd_scrub_start(dev, flags);
mutex_unlock(&dev->od_otable_mutex);
RETURN(rc == -EALREADY ? 0 : rc);
init_waitqueue_head(&scrub->os_thread.t_ctl_waitq);
init_rwsem(&scrub->os_rwsem);
spin_lock_init(&scrub->os_lock);
- CFS_INIT_LIST_HEAD(&scrub->os_inconsistent_items);
+ INIT_LIST_HEAD(&scrub->os_inconsistent_items);
push_ctxt(&saved, ctxt);
filp = filp_open(osd_scrub_name, O_RDWR | O_CREAT, 0644);
RETURN(PTR_ERR(filp));
}
- inode = filp->f_dentry->d_inode;
+ inode = filp->f_path.dentry->d_inode;
/* 'What the @fid is' is not imporatant, because the object
* has no OI mapping, and only is visible inside the OSD.*/
lu_igif_build(fid, inode->i_ino, inode->i_generation);
rc = osd_ea_fid_set(info, inode, fid, LMAC_NOT_IN_OI, 0);
if (rc != 0) {
- filp_close(filp, 0);
+ filp_close(filp, NULL);
pop_ctxt(&saved, ctxt);
RETURN(rc);
}
scrub->os_inode = igrab(inode);
- filp_close(filp, 0);
+ filp_close(filp, NULL);
pop_ctxt(&saved, ctxt);
rc = osd_scrub_file_load(scrub);
sf->sf_internal_flags = SIF_NO_HANDLE_OLD_FID;
dirty = 1;
} else if (rc != 0) {
- RETURN(rc);
+ GOTO(cleanup_inode, rc);
} else {
if (memcmp(sf->sf_uuid, es->s_uuid, 16) != 0) {
+ struct obd_uuid *old_uuid;
+ struct obd_uuid *new_uuid;
+
+ OBD_ALLOC_PTR(old_uuid);
+ OBD_ALLOC_PTR(new_uuid);
+ if (old_uuid == NULL || new_uuid == NULL) {
+ CERROR("%.16s: UUID has been changed, but"
+ "failed to allocate RAM for report\n",
+ LDISKFS_SB(sb)->s_es->s_volume_name);
+ } else {
+ class_uuid_unparse(sf->sf_uuid, old_uuid);
+ class_uuid_unparse(es->s_uuid, new_uuid);
+ CERROR("%.16s: UUID has been changed from "
+ "%s to %s\n",
+ LDISKFS_SB(sb)->s_es->s_volume_name,
+ old_uuid->uuid, new_uuid->uuid);
+ }
osd_scrub_file_reset(scrub, es->s_uuid,SF_INCONSISTENT);
dirty = 1;
+ if (old_uuid != NULL)
+ OBD_FREE_PTR(old_uuid);
+ if (new_uuid != NULL)
+ OBD_FREE_PTR(new_uuid);
} else if (sf->sf_status == SS_SCANNING) {
sf->sf_status = SS_CRASHED;
dirty = 1;
if (dirty != 0) {
rc = osd_scrub_file_store(scrub);
if (rc != 0)
- RETURN(rc);
+ GOTO(cleanup_inode, rc);
}
/* Initialize OI files. */
rc = osd_oi_init(info, dev);
if (rc < 0)
- RETURN(rc);
+ GOTO(cleanup_inode, rc);
rc = osd_initial_OI_scrub(info, dev);
- if (rc == 0) {
- if (sf->sf_flags & SF_UPGRADE ||
- !(sf->sf_internal_flags & SIF_NO_HANDLE_OLD_FID ||
- sf->sf_success_count > 0)) {
- dev->od_igif_inoi = 0;
- dev->od_check_ff = dev->od_is_ost;
- } else {
- dev->od_igif_inoi = 1;
- dev->od_check_ff = 0;
- }
-
- if (sf->sf_flags & SF_INCONSISTENT)
- /* The 'od_igif_inoi' will be set under the
- * following cases:
- * 1) new created system, or
- * 2) restored from file-level backup, or
- * 3) the upgrading completed.
- *
- * The 'od_igif_inoi' may be cleared by OI scrub
- * later if found that the system is upgrading. */
- dev->od_igif_inoi = 1;
+ if (rc != 0)
+ GOTO(cleanup_oi, rc);
- if (!dev->od_noscrub &&
- ((sf->sf_status == SS_PAUSED) ||
- (sf->sf_status == SS_CRASHED &&
- sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT |
- SF_UPGRADE | SF_AUTO)) ||
- (sf->sf_status == SS_INIT &&
- sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT |
- SF_UPGRADE))))
- rc = osd_scrub_start(dev);
+ if (sf->sf_flags & SF_UPGRADE ||
+ !(sf->sf_internal_flags & SIF_NO_HANDLE_OLD_FID ||
+ sf->sf_success_count > 0)) {
+ dev->od_igif_inoi = 0;
+ dev->od_check_ff = dev->od_is_ost;
+ } else {
+ dev->od_igif_inoi = 1;
+ dev->od_check_ff = 0;
}
+ if (sf->sf_flags & SF_INCONSISTENT)
+ /* The 'od_igif_inoi' will be set under the
+ * following cases:
+ * 1) new created system, or
+ * 2) restored from file-level backup, or
+ * 3) the upgrading completed.
+ *
+ * The 'od_igif_inoi' may be cleared by OI scrub
+ * later if found that the system is upgrading. */
+ dev->od_igif_inoi = 1;
+
+ if (!dev->od_noscrub &&
+ ((sf->sf_status == SS_PAUSED) ||
+ (sf->sf_status == SS_CRASHED &&
+ sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT |
+ SF_UPGRADE | SF_AUTO)) ||
+ (sf->sf_status == SS_INIT &&
+ sf->sf_flags & (SF_RECREATED | SF_INCONSISTENT |
+ SF_UPGRADE))))
+ rc = osd_scrub_start(dev, SS_AUTO_FULL);
+
+ if (rc != 0)
+ GOTO(cleanup_oi, rc);
+
/* it is possible that dcache entries may keep objects after they are
* deleted by OSD. While it looks safe this can cause object data to
* stay until umount causing failures in tests calculating free space,
* anymore let's just free them after use here */
shrink_dcache_sb(sb);
- RETURN(rc);
+ RETURN(0);
+cleanup_oi:
+ osd_oi_fini(info, dev);
+cleanup_inode:
+ iput(scrub->os_inode);
+ scrub->os_inode = NULL;
+
+ return rc;
}
void osd_scrub_cleanup(const struct lu_env *env, struct osd_device *dev)
/* object table based iteration APIs */
static struct dt_it *osd_otable_it_init(const struct lu_env *env,
- struct dt_object *dt, __u32 attr,
- struct lustre_capa *capa)
+ struct dt_object *dt, __u32 attr)
{
enum dt_otable_it_flags flags = attr >> DT_OTABLE_IT_FLAGS_SHIFT;
enum dt_otable_it_valid valid = attr & ~DT_OTABLE_IT_FLAGS_MASK;
start |= SS_CLEAR_DRYRUN;
}
- rc = do_osd_scrub_start(dev, start);
+ rc = do_osd_scrub_start(dev, start & ~SS_AUTO_PARTIAL);
if (rc < 0 && rc != -EALREADY) {
dev->od_otable_it = NULL;
OBD_FREE_PTR(it);
/* high priority inconsistent items list APIs */
+#define SCRUB_BAD_OIMAP_DECAY_INTERVAL 60
+
int osd_oii_insert(struct osd_device *dev, struct osd_idmap_cache *oic,
int insert)
{
if (unlikely(oii == NULL))
RETURN(-ENOMEM);
- CFS_INIT_LIST_HEAD(&oii->oii_list);
+ INIT_LIST_HEAD(&oii->oii_list);
oii->oii_cache = *oic;
oii->oii_insert = insert;
+ if (scrub->os_partial_scan) {
+ __u64 now = cfs_time_current_sec();
+
+ /* If there haven't been errors in a long time,
+ * decay old count until either the errors are
+ * gone or we reach the current interval. */
+ while (unlikely(scrub->os_bad_oimap_count > 0 &&
+ scrub->os_bad_oimap_time +
+ SCRUB_BAD_OIMAP_DECAY_INTERVAL < now)) {
+ scrub->os_bad_oimap_count >>= 1;
+ scrub->os_bad_oimap_time +=
+ SCRUB_BAD_OIMAP_DECAY_INTERVAL;
+ }
+
+ scrub->os_bad_oimap_time = now;
+ if (++scrub->os_bad_oimap_count >
+ dev->od_full_scrub_threshold_rate)
+ scrub->os_full_scrub = 1;
+ }
+
spin_lock(&scrub->os_lock);
if (unlikely(!thread_is_running(thread))) {
spin_unlock(&scrub->os_lock);
RETURN(-EAGAIN);
}
- if (cfs_list_empty(&scrub->os_inconsistent_items))
+ if (list_empty(&scrub->os_inconsistent_items))
wakeup = 1;
- cfs_list_add_tail(&oii->oii_list, &scrub->os_inconsistent_items);
+ list_add_tail(&oii->oii_list, &scrub->os_inconsistent_items);
spin_unlock(&scrub->os_lock);
if (wakeup != 0)
ENTRY;
spin_lock(&scrub->os_lock);
- cfs_list_for_each_entry(oii, &scrub->os_inconsistent_items, oii_list) {
+ list_for_each_entry(oii, &scrub->os_inconsistent_items, oii_list) {
if (lu_fid_eq(fid, &oii->oii_cache.oic_fid)) {
*id = oii->oii_cache.oic_lid;
spin_unlock(&scrub->os_lock);
if (thread_is_running(&scrub->os_thread)) {
cfs_duration_t duration = cfs_time_current() -
scrub->os_time_last_checkpoint;
- __u64 new_checked = scrub->os_new_checked * HZ;
+ __u64 new_checked = msecs_to_jiffies(scrub->os_new_checked *
+ MSEC_PER_SEC);
__u32 rtime = sf->sf_run_time +
cfs_duration_sec(duration + HALF_SEC);
"real-time_speed: "LPU64" objects/sec\n"
"current_position: %u\n"
"lf_scanned: "LPU64"\n"
- "lf_reparied: "LPU64"\n"
+ "lf_repaired: "LPU64"\n"
"lf_failed: "LPU64"\n",
rtime, speed, new_checked, scrub->os_pos_current,
scrub->os_lf_scanned, scrub->os_lf_repaired,
"real-time_speed: N/A\n"
"current_position: N/A\n"
"lf_scanned: "LPU64"\n"
- "lf_reparied: "LPU64"\n"
+ "lf_repaired: "LPU64"\n"
"lf_failed: "LPU64"\n",
sf->sf_run_time, speed, scrub->os_lf_scanned,
scrub->os_lf_repaired, scrub->os_lf_failed);