You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2012/11/21 09:22:47 UTC

[1/2] git commit: Range acceleration fix: Disable range accelleration

Updated Branches:
  refs/heads/3.2.x 35548371c -> 79c436cb9


Range acceleration fix: Disable range accelleration

[TS-1575] Disable range acceleration by changing is_pread_capable to always return false.
Put the current code in an #if  so it can be enabled for those willing to risk it.
This issue   is fixed on 3.3.X but the patch is much too large to backport.

Test/Review: igalic, amc, zwoop
Backport: igalic


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/79c436cb
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/79c436cb
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/79c436cb

Branch: refs/heads/3.2.x
Commit: 79c436cb93da256e358d729557b3bd53d764f4fc
Parents: 77b9a2e
Author: Igor Galić <i....@brainsware.org>
Authored: Wed Nov 21 09:20:51 2012 +0100
Committer: Igor Galić <i....@brainsware.org>
Committed: Wed Nov 21 09:20:51 2012 +0100

----------------------------------------------------------------------
 CHANGES                        |    2 ++
 STATUS                         |    8 --------
 iocore/cache/P_CacheInternal.h |    5 +++++
 3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79c436cb/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index ce545b8..2367273 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.2.3
 
+  [TS-1575] Ranges broken, "fix" by dsiabling
+ 
   *) [TS-1536] SNI support breaks IP-based lookup
 
   *) [TS-1523] High CPU on *BSD

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79c436cb/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 3dea08a..6f7e90f 100644
--- a/STATUS
+++ b/STATUS
@@ -41,14 +41,6 @@ A list of all bugs open for the next development release can be found at
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
-  Range acceleration fix: Disable range acceleration by changing
-  is_pread_capable to always return false. Put the current code in an
-  #if 0 so it can be enabled for those willing to risk it. This issue
-  is fixed on 3.3.X but the patch is much too large to backport.
-  Jira: https://issues.apache.org/jira/browse/TS-1575
-  Patch: https://issues.apache.org/jira/secure/attachment/12553896/0001-Fix-for-Range-bug-on-3.2.x.patch
-  +1: igalic, amc, zwoop
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/79c436cb/iocore/cache/P_CacheInternal.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index fb5393f..504ddf5 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -758,8 +758,13 @@ CacheVC::get_frag_table() {
 
 TS_INLINE bool
 CacheVC::is_pread_capable() {
+/* "fix" for Range related crashers: */
+#if defined(RANGES_DONT_WORK_VERY_WELL_ON_3_2_X)
   ink_debug_assert(od);
   return od->vector.count() <= 1;
+#else
+  return false;
+#endif
 }
 
 TS_INLINE int