trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject trafficserver git commit: TS-3274: Fix race condition for cache fixup in ram cache.
Date Fri, 09 Jan 2015 02:07:54 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/5.2.x 143d63310 -> 998712abb


TS-3274: Fix race condition for cache fixup in ram cache.

Conflicts:
	CHANGES


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

Branch: refs/heads/5.2.x
Commit: 998712abbe5d71bf249bf93e909c4c20e935bfd9
Parents: 143d633
Author: Alan M. Carroll <amc@apache.org>
Authored: Tue Jan 6 11:08:20 2015 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Thu Jan 8 19:07:37 2015 -0700

----------------------------------------------------------------------
 CHANGES                   | 3 +++
 iocore/cache/CacheRead.cc | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/998712ab/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index aafac69..4edf598 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ Changes with Apache Traffic Server 5.2.0
 
   *) [TS-3276] Fix cache backwards compatibility issue.
 
+  *) [TS-3274] Forward port fix for cache fixup race condition in ram cache
+   from 4.2.X.
+
   *) [TS-2119] Fix builds for mysql remap plugin.
 
   *) [TS-3083] Fix core dump due to FetchSM double delete.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/998712ab/iocore/cache/CacheRead.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index d6fe0f8..a20737e 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -161,7 +161,8 @@ uint32_t
 CacheVC::load_http_info(CacheHTTPInfoVector* info, Doc* doc, RefCountObj * block_ptr)
 {
   uint32_t zret = info->get_handles(doc->hdr(), doc->hlen, block_ptr);
-  if (cache_config_compatibility_4_2_0_fixup &&
+  if (cache_config_compatibility_4_2_0_fixup && // manual override not engaged
+      ! this->f.doc_from_ram_cache && // it's already been done for ram cache
fragments
       vol->header->version.ink_major == 23 && vol->header->version.ink_minor
== 0
     ) {
     for ( int i = info->xcount - 1 ; i >= 0 ; --i ) {


Mime
View raw message