This is causing conf-sanity test_69 failures in LU-12404 due to
the increased limit on the number of objects precreated after
recovery. The issue will be fixed in a different way.
This reverts commit
d07d9c5ed0aa1d6614944c7d1e0ca55cba301dc4.
Change-Id: I437889f20699207fa15eff6685b0992292555f19
Reviewed-on: https://review.whamcloud.com/35388
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Sergey Cheremencev <c17829@cray.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
* in place of an old one at the same index. Instead of
* precreating potentially millions of deleted old objects
* (possibly filling the OST), only precreate the last batch.
* in place of an old one at the same index. Instead of
* precreating potentially millions of deleted old objects
* (possibly filling the OST), only precreate the last batch.
- * LFSCK will eventually clean up any orphans. LU-14
- * 500000 is a theoretical maximum number of objects that could
- * be created(but not stored on disk in case of failover)
- * during default journal commit interval - 5 seconds. */
- if (diff > 500000) {
+ * LFSCK will eventually clean up any orphans. LU-14 */
+ if (diff > 5 * OST_MAX_PRECREATE) {
diff = OST_MAX_PRECREATE / 2;
LCONSOLE_WARN("%s: Too many FIDs to precreate "
diff = OST_MAX_PRECREATE / 2;
LCONSOLE_WARN("%s: Too many FIDs to precreate "
- "precreate FID"DOSTID" LAST_ID"DOSTID
"OST replaced or reformatted: "
"OST replaced or reformatted: "
- "LFSCK will clean up\n",
- ofd_name(ofd), POSTID(&oa->o_oi),
- POSTID(&oseq->os_oi));
+ "LFSCK will clean up",
+ ofd_name(ofd));
- CDEBUG(D_HA, "%s: precreate FID "DOSTID" is over 500000"
- "larger than the LAST_ID "DOSTID", only "
+ CDEBUG(D_HA, "%s: precreate FID "DOSTID" is over "
+ "%u larger than the LAST_ID "DOSTID", only "
"precreating the last %lld objects.\n",
ofd_name(ofd), POSTID(&oa->o_oi),
"precreating the last %lld objects.\n",
ofd_name(ofd), POSTID(&oa->o_oi),
POSTID(&oseq->os_oi), diff);
ofd_seq_last_oid_set(oseq, ostid_id(&oa->o_oi) - diff);
}
POSTID(&oseq->os_oi), diff);
ofd_seq_last_oid_set(oseq, ostid_id(&oa->o_oi) - diff);
}