From 9a0734af947f8fadadb83f2a2d0949eef7100621 Mon Sep 17 00:00:00 2001 From: johann Date: Wed, 27 May 2009 14:52:33 +0000 Subject: [PATCH] Branch b_release_1_8_1 b=18518 i=adilger i=bobijam OST object precreation becomes very slow on big OSTs. This is due to the ialloc patch spending too much time scanning groups. --- ldiskfs/kernel_patches/series/ldiskfs-2.6-fc3.series | 1 - ldiskfs/kernel_patches/series/ldiskfs-2.6-fc5.series | 1 - ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series | 1 - ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series | 1 - ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series | 1 - ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series | 1 - ldiskfs/kernel_patches/series/ldiskfs-2.6-suse.series | 1 - ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series | 1 - ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series | 1 - lustre/obdfilter/filter.c | 3 +++ 10 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc3.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc3.series index 1e24d94..7f3a15c 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc3.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc3.series @@ -8,5 +8,4 @@ ext3-include-fixes-2.6-rhel4.patch ext3-extents-2.6.9-rhel4.patch ext3-mballoc2-2.6.9-rhel4.patch ext3-nlinks-2.6.9.patch -ext3-ialloc-2.6.patch ext3-lookup-dotdot-2.6.9.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc5.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc5.series index 3d78f2a..aaa5ffb 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc5.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc5.series @@ -6,7 +6,6 @@ ext3-include-fixes-2.6-rhel4.patch ext3-extents-2.6.15.patch ext3-mballoc2-2.6-fc5.patch ext3-nlinks-2.6.9.patch -ext3-ialloc-2.6.patch ext3-remove-cond_resched-calls-2.6.12.patch ext3-filterdata-2.6.15.patch ext3-lookup-dotdot-2.6.9.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series index fded7f5..b9509ec 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel4.series @@ -13,7 +13,6 @@ ext3-extents-sanity-checks.patch ext3-mballoc3-core.patch ext3-mballoc3-rhel4.patch ext3-nlinks-2.6.9.patch -ext3-ialloc-2.6.patch ext3-lookup-dotdot-2.6.9.patch ext3-sector_t-overflow-2.6.9-rhel4.patch ext3-check-jbd-errors-2.6.9.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series index 86b890d..ae1ad0a 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series @@ -7,7 +7,6 @@ ext3-extents-2.6.18-vanilla.patch ext3-mballoc3-core.patch ext3-mballoc3-2.6.18.patch ext3-nlinks-2.6-rhel5.patch -ext3-ialloc-2.6.patch ext3-remove-cond_resched-calls-2.6.12.patch ext3-filterdata-sles10.patch ext3-uninit-2.6.18.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series index 7db41e5..b755452 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series @@ -11,7 +11,6 @@ ext3-extents-sanity-checks.patch ext3-mballoc3-core.patch ext3-mballoc3-sles10.patch ext3-nlinks-2.6.9.patch -ext3-ialloc-2.6.patch ext3-remove-cond_resched-calls-2.6.12.patch ext3-filterdata-sles10.patch ext3-disable-write-bar-by-default-2.6-sles10.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series index a988805..06b1d34 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series @@ -3,7 +3,6 @@ iopen-sles11.patch ext4-map_inode_page-sles11.patch export-ext4-2.6-sles11.patch ext4-include-fixes-2.6-sles11.patch -ext4-ialloc-2.6-sles11.patch ext4-remove-cond_resched-calls-sles11.patch ext4-filterdata-sles11.patch ext4-mmp-sles11.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-suse.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-suse.series index 74bea96..a1d2e2a 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-suse.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-suse.series @@ -14,7 +14,6 @@ ext3-mballoc3-core.patch ext3-mballoc3-suse.patch ext3-nlinks-2.6.7.patch ext3-rename-reserve-2.6-suse.patch -ext3-ialloc-2.6.patch ext3-lookup-dotdot-2.6.9.patch ext3-sector_t-overflow-2.6.5-suse.patch ext3-check-jbd-errors-2.6.5.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series index 843efb8..b4d069a 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series @@ -7,7 +7,6 @@ ext3-extents-2.6.18-vanilla.patch ext3-mballoc3-core.patch ext3-mballoc3-2.6.18.patch ext3-nlinks-2.6.9.patch -ext3-ialloc-2.6.patch ext3-remove-cond_resched-calls-2.6.12.patch ext3-filterdata-sles10.patch ext3-16tb-overflow-fixes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series index ba4df9a..cd4ddda 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series @@ -7,7 +7,6 @@ ext3-extents-2.6.22-vanilla.patch ext3-mballoc3-core.patch ext3-mballoc3-2.6.22.patch ext3-nlinks-2.6.22-vanilla.patch -ext3-ialloc-2.6.22-vanilla.patch ext3-remove-cond_resched-calls-2.6.12.patch ext3-filterdata-sles10.patch ext3-uninit-2.6.22-vanilla.patch diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index 99b038c..5dcf7e2 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -3329,6 +3329,9 @@ static int filter_precreate(struct obd_device *obd, struct obdo *oa, CERROR("create failed rc = %d\n", rc); GOTO(cleanup, rc); } + if (dchild->d_inode) + CDEBUG(D_INFO, "objid "LPU64" got inum %lu\n", next_id, + dchild->d_inode->i_ino); set_last_id: if (!recreate_obj) { -- 1.8.3.1