Branch b1_8

b=19128
i=tappro
i=adilger

disable async journal commit on bulk write feature because of recovery issues.
remove SLES9 & RHEL4 from which_patch.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index a19ec94..e2ab5f5 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -163,7 +163,11 @@ Severity   : enhancement
 Bugzilla   : 16919
 Descriptoin: Don't sync journal after every i/o
 Details    : Implement write RPC replay to allow server replies for write RPCs
-            before data is on disk.
+            before data is on disk. However, this feature is disabled by
+            default since some issues leading to data corruptions have been
+            found during recovery (e.g. bug 19128). This feature can be enabled
+            by running the following command on the OSSs:
+            lctl set_param obdfilter.*.sync_journal=0
 
 Severity   : low
 Bugzilla   : 18016

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index fd9d7b3..eaffeb9 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -1,9 +1,6 @@
 SERIES                VERSION                  COMMENT
 
 SUPPORTED KERNELS:
-2.6-suse              SLES9 before SP1         already in SLES9 SP1 kernel
-2.6-suse-newer        SLES9: 2.6.5-7.315       extra patches for SLES9 after SP1
-2.6-rhel4             RHEL4: 2.6.9-67.0.22.EL
 2.6-sles10            SLES10: 2.6.16.60-0.37
 2.6-rhel5             RHEL5: 2.6.18-128.1.6.el5
 2.6.18-vanilla        kernel.org: 2.6.18.8
@@ -11,10 +8,3 @@ SUPPORTED KERNELS:
 
 CLIENT SUPPORT FOR UNPATCHED KERNELS:
                    kernel.org 2.6.16-2.6.22
-                   RHEL4: 2.6.9-42.0.8EL
-
-NB - The patches in the 2.6-suse series are already in the SLES9 SP1
-     kernel.  The patches in the 2.6-suse-newer series are patches that
-     have been created since the SP1 kernel was released and should be
-     applied to the already-patched SP1 kernel.  Only the 2.6-suse-newer
-     series needs to be applied via quilt to any recent SLES9 kernel.

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 0337d6b..52a46f1 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -1938,7 +1938,7 @@ int filter_common_setup(struct obd_device *obd, obd_count len, void *buf,
         filter->fo_readcache_max_filesize = FILTER_MAX_CACHE_SIZE;
         filter->fo_fmd_max_num = FILTER_FMD_MAX_NUM_DEFAULT;
         filter->fo_fmd_max_age = FILTER_FMD_MAX_AGE_DEFAULT;
-        filter->fo_syncjournal = 0; /* Don't sync journals on i/o by default */
+        filter->fo_syncjournal = 1; /* Sync journals on i/o by default b=19128 */
 
         rc = filter_prep(obd);
         if (rc)