You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2011/03/12 23:57:04 UTC
svn commit: r1081015 - in /trafficserver/traffic/trunk/iocore/cache:
Cache.cc P_CacheDisk.h
Author: jplevyak
Date: Sat Mar 12 22:57:04 2011
New Revision: 1081015
URL: http://svn.apache.org/viewvc?rev=1081015&view=rev
Log:
Convert hardware sector size Error to a Warning and
clamp the value below 8k. This should only effect Solaris.
Modified:
trafficserver/traffic/trunk/iocore/cache/Cache.cc
trafficserver/traffic/trunk/iocore/cache/P_CacheDisk.h
Modified: trafficserver/traffic/trunk/iocore/cache/Cache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Cache.cc?rev=1081015&r1=1081014&r2=1081015&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Cache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Cache.cc Sat Mar 12 22:57:04 2011
@@ -585,8 +585,10 @@ CacheProcessor::start_internal(int flags
int sector_size = sd->hw_sector_size;
if (sector_size < cache_config_force_sector_size)
sector_size = cache_config_force_sector_size;
- if (sd->hw_sector_size <= 0 || sector_size > STORE_BLOCK_SIZE)
- Error("bad hardware sector size");
+ if (sd->hw_sector_size <= 0 || sector_size > STORE_BLOCK_SIZE) {
+ Warning("bad hardware sector size %d, resetting to %d", sector_size, STORE_BLOCK_SIZE);
+ 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);
gdisks[gndisks]->open(path, blocks, skip, sector_size, fd, clear);
Modified: trafficserver/traffic/trunk/iocore/cache/P_CacheDisk.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/P_CacheDisk.h?rev=1081015&r1=1081014&r2=1081015&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/P_CacheDisk.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/P_CacheDisk.h Sat Mar 12 22:57:04 2011
@@ -88,7 +88,6 @@ struct DiskHeader
struct CacheDisk:public Continuation
{
-
DiskHeader *header;
char *path;
int header_len;