Updated Branches: refs/heads/master 8ab44edd4 -> 7c6b590b3
TS-1319: Fix cache sizes > 16TB Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7c6b590b Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7c6b590b Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7c6b590b Branch: refs/heads/master Commit: 7c6b590b35ce483c8ae94640c50a6a3fb0d0e690 Parents: 8ab44ed Author: Jan Van Doorn <jan_vando...@cable.comcast.com> Authored: Thu Jul 12 20:43:56 2012 -0700 Committer: James Peach <jpe...@apache.org> Committed: Thu Jul 12 20:43:56 2012 -0700 ---------------------------------------------------------------------- iocore/cache/Cache.cc | 6 +++--- iocore/cache/P_CacheHosting.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c6b590b/iocore/cache/Cache.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc index d9d772a..80f4f96 100644 --- a/iocore/cache/Cache.cc +++ b/iocore/cache/Cache.cc @@ -2358,11 +2358,11 @@ cplist_reconfigure() percent_remaining -= (config_vol->size < 128) ? 0 : config_vol->percent; } if (config_vol->size < 128) { - Warning("the size of volume %d (%d) is less than the minimum required volume size %d", - config_vol->number, config_vol->size, 128); + Warning("the size of volume %d (%"PRId64") is less than the minimum required volume size %d", + config_vol->number, (int64_t)config_vol->size, 128); Warning("volume %d is not created", config_vol->number); } - Debug("cache_hosting", "Volume: %d Size: %d", config_vol->number, config_vol->size); + Debug("cache_hosting", "Volume: %d Size: %"PRId64, config_vol->number, (int64_t)config_vol->size); } cplist_update(); /* go through volume config and grow and create volumes */ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c6b590b/iocore/cache/P_CacheHosting.h ---------------------------------------------------------------------- diff --git a/iocore/cache/P_CacheHosting.h b/iocore/cache/P_CacheHosting.h index a281985..2f5c7e3 100644 --- a/iocore/cache/P_CacheHosting.h +++ b/iocore/cache/P_CacheHosting.h @@ -162,7 +162,7 @@ struct ConfigVol { int number; int scheme; - int size; + off_t size; bool in_percent; int percent; CacheVol *cachep;
