Updated Branches: refs/heads/master 942ce067b -> 0850b1235
TS-954: Change block size calculation to be more accurate. Cache version bump. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0850b123 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0850b123 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0850b123 Branch: refs/heads/master Commit: 0850b12350f28ef068d1f7652defc4eb6bd0b91f Parents: 942ce06 Author: Alan M. Carroll <[email protected]> Authored: Fri Jul 19 15:01:45 2013 -0500 Committer: Alan M. Carroll <[email protected]> Committed: Fri Jul 19 15:01:45 2013 -0500 ---------------------------------------------------------------------- CHANGES | 3 ++- iocore/cache/Cache.cc | 2 +- iocore/cache/I_CacheDefs.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0850b123/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index d8a2500..1c0b047 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,7 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.3.5 + *) [TS-954] Better calculation of blocks in volume. Bumped cache DB version. *) [TS-2050] Cleanup ink_config.h.in, removing unused symbols. @@ -8,7 +9,7 @@ Changes with Apache Traffic Server 3.3.5 added delay listen for cache. Removed TS_NO_API defined/build option. *) [TS-2047] Schedule RamCacheCLFUSCompressor in RamCacheCLFUS::init instead - of immediatly after instantiation. + of immediately after instantiation. *) [TS-2042] Remove remnants of unused vingid command line option. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0850b123/iocore/cache/Cache.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc index 06e7edf..13e46fc 100644 --- a/iocore/cache/Cache.cc +++ b/iocore/cache/Cache.cc @@ -749,7 +749,7 @@ CacheProcessor::start_internal(int flags) sector_size = STORE_BLOCK_SIZE; } off_t skip = ROUND_TO_STORE_BLOCK((sd->offset < START_POS ? START_POS + sd->alignment : sd->offset)); - blocks = blocks - ROUND_TO_STORE_BLOCK(sd->offset + skip); + blocks = blocks - ROUND_TO_STORE_BLOCK(skip); #if AIO_MODE == AIO_MODE_NATIVE eventProcessor.schedule_imm(NEW(new DiskInit(gdisks[gndisks], path, blocks, skip, sector_size, fd, clear))); #else http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0850b123/iocore/cache/I_CacheDefs.h ---------------------------------------------------------------------- diff --git a/iocore/cache/I_CacheDefs.h b/iocore/cache/I_CacheDefs.h index da5c682..96337de 100644 --- a/iocore/cache/I_CacheDefs.h +++ b/iocore/cache/I_CacheDefs.h @@ -33,7 +33,7 @@ #define CACHE_ALT_INDEX_DEFAULT -1 #define CACHE_ALT_REMOVED -2 -#define CACHE_DB_MAJOR_VERSION 22 +#define CACHE_DB_MAJOR_VERSION 23 #define CACHE_DB_MINOR_VERSION 0 #define CACHE_DIR_MAJOR_VERSION 18
