From 02383a9f01a00c7b8e8a5f4666c8f02874d07a12 Mon Sep 17 00:00:00 2001
From: shadow <shadow>
Date: Fri, 23 May 2008 06:02:49 +0000
Subject: [PATCH] don't create too many objects after del orphan. b=14835
i=tappro i=deen
---
lustre/ChangeLog | 8 ++++++++
lustre/osc/osc_create.c | 16 ++++++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 216a81a449..a1ccc1bb88 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -12,6 +12,14 @@ tbd Sun Microsystems, Inc.
* RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
removed cwd "./" (refer to Bugzilla 14399).
+Severity : normal
+Bugzilla : 14835
+Frequency : after recovery
+Description: precreate to many object's after del orphan.
+Details : del orphan st in oscc last_id == next_id and this triger growing
+ count of precreated objects. Set flag LOW to skip increase count
+ of precreated objects.
+
Severity : normal
Bugzilla : 15139
Frequency : rare, on clear nid stats
diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c
index aff69bdeb7..ab1052b700 100644
--- a/lustre/osc/osc_create.c
+++ b/lustre/osc/osc_create.c
@@ -132,8 +132,14 @@ static int oscc_internal_create(struct osc_creator *oscc)
LASSERT_SPIN_LOCKED(&oscc->oscc_lock);
+ if (oscc->oscc_flags & OSCC_FLAG_CREATING ||
+ oscc->oscc_flags & OSCC_FLAG_RECOVERING) {
+ spin_unlock(&oscc->oscc_lock);
+ RETURN(0);
+ }
+
if (oscc->oscc_grow_count < OST_MAX_PRECREATE &&
- !(oscc->oscc_flags & (OSCC_FLAG_LOW | OSCC_FLAG_RECOVERING)) &&
+ ((oscc->oscc_flags & OSCC_FLAG_LOW) == 0) &&
(__s64)(oscc->oscc_last_id - oscc->oscc_next_id) <=
(oscc->oscc_grow_count / 4 + 1)) {
oscc->oscc_flags |= OSCC_FLAG_LOW;
@@ -143,11 +149,6 @@ static int oscc_internal_create(struct osc_creator *oscc)
if (oscc->oscc_grow_count > OST_MAX_PRECREATE / 2)
oscc->oscc_grow_count = OST_MAX_PRECREATE / 2;
- if (oscc->oscc_flags & OSCC_FLAG_CREATING ||
- oscc->oscc_flags & OSCC_FLAG_RECOVERING) {
- spin_unlock(&oscc->oscc_lock);
- RETURN(0);
- }
oscc->oscc_flags |= OSCC_FLAG_CREATING;
spin_unlock(&oscc->oscc_lock);
@@ -326,6 +327,9 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
RETURN(0);
}
oscc->oscc_flags |= OSCC_FLAG_SYNC_IN_PROGRESS;
+ /* seting flag LOW we prevent extra grow precreate size
+ * and enforce use last assigned size */
+ oscc->oscc_flags |= OSCC_FLAG_LOW;
spin_unlock(&oscc->oscc_lock);
CDEBUG(D_HA, "%s: oscc recovery started - delete to "LPU64"\n",
oscc->oscc_obd->obd_name, oscc->oscc_next_id - 1);
--
GitLab