From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 3 18:50:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 02C7A64D for ; Mon, 3 Jun 2013 18:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id DE6D11FB4 for ; Mon, 3 Jun 2013 18:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r53Io1b5010473 for ; Mon, 3 Jun 2013 18:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r53Io1t3010472; Mon, 3 Jun 2013 18:50:01 GMT (envelope-from gnats) Resent-Date: Mon, 3 Jun 2013 18:50:01 GMT Resent-Message-Id: <201306031850.r53Io1t3010472@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hung-Yi Chen Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 970A7627 for ; Mon, 3 Jun 2013 18:47:00 +0000 (UTC) (envelope-from gaod@cse.tw) Received: from cse.tw (cse.tw [140.138.145.234]) by mx1.freebsd.org (Postfix) with ESMTP id 661301F93 for ; Mon, 3 Jun 2013 18:46:59 +0000 (UTC) Received: from cse.tw (localhost [127.0.0.1]) by cse.tw (Postfix) with ESMTP id 28CC9187BC36 for ; Tue, 4 Jun 2013 02:47:23 +0800 (CST) Received: (from gaod@localhost) by cse.tw (8.14.5/8.14.5/Submit) id r53IlNoj080612; Tue, 4 Jun 2013 02:47:23 +0800 (CST) (envelope-from gaod) Message-Id: <201306031847.r53IlNoj080612@cse.tw> Date: Tue, 4 Jun 2013 02:47:23 +0800 (CST) From: Hung-Yi Chen To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/179268: [PATCH] www/trafficserver: Fix disk usage miscalculated X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Hung-Yi Chen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jun 2013 18:50:02 -0000 >Number: 179268 >Category: ports >Synopsis: [PATCH] www/trafficserver: Fix disk usage miscalculated >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jun 03 18:50:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Hung-Yi Chen >Release: FreeBSD 9.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD cse.tw 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: FreeBSD miscalculates disk size based on config by 2x for file-based, and 16x for raw-based. Apply upstream fix, see https://issues.apache.org/jira/browse/TS-1784. >How-To-Repeat: >Fix: --- trafficserver.diff begins here --- Index: www/trafficserver/Makefile =================================================================== --- www/trafficserver/Makefile (revision 319796) +++ www/trafficserver/Makefile (working copy) @@ -7,6 +7,7 @@ PORTNAME= trafficserver PORTVERSION= 3.2.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= APACHE/${PORTNAME} Index: www/trafficserver/files/patch-iocore_cache_Store.cc =================================================================== --- www/trafficserver/files/patch-iocore_cache_Store.cc (revision 0) +++ www/trafficserver/files/patch-iocore_cache_Store.cc (working copy) @@ -0,0 +1,29 @@ +--- iocore/cache/Store.cc.orig 2013-05-25 01:18:36.000000000 +0800 ++++ iocore/cache/Store.cc 2013-05-25 01:20:00.000000000 +0800 +@@ -483,7 +483,9 @@ + disk_id = devnum; + + pathname = ats_strdup(an); +- blocks = size / hw_sector_size; ++ // igalic: blocks = size / hw_sector_size; was wrong TS-1707 ++ // This code needs refactoring to unify the code-paths which are equal across platforms. ++ blocks = size / STORE_BLOCK_SIZE; + file_pathname = !((s.st_mode & S_IFMT) == S_IFDIR); + + // This is so FreeBSD admins don't worry about our malicious code creating boot sector viruses: +@@ -583,6 +585,7 @@ + + pathname = ats_strdup(filename); + // is this right Seems like this should be size / hw_sector_size ++ // igalic: No. See TS-1707 + blocks = size / STORE_BLOCK_SIZE; + file_pathname = !((s.st_mode & S_IFMT) == S_IFDIR); + +@@ -715,6 +718,7 @@ + /* I don't know why I'm redefining blocks to be something that is quite + * possibly something other than the actual number of blocks, but the + * code for other arches seems to. Revisit this, perhaps. */ ++ // igalic: No. See TS-1707 + blocks = size / STORE_BLOCK_SIZE; + + Debug("cache_init", "Span::init physical sectors %" PRId64 " total size %" PRId64 " geometry size %" PRId64 " store blocks %" PRId64 "", --- trafficserver.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: