From owner-svn-src-head@FreeBSD.ORG  Sun Feb  2 14:11:35 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5580BEBF;
 Sun,  2 Feb 2014 14:11:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 420BF1FBE;
 Sun,  2 Feb 2014 14:11:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s12EBZkJ071648;
 Sun, 2 Feb 2014 14:11:35 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s12EBZXW071647;
 Sun, 2 Feb 2014 14:11:35 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201402021411.s12EBZXW071647@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 2 Feb 2014 14:11:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261401 - head/usr.sbin/newsyslog
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Feb 2014 14:11:35 -0000

Author: bdrewery
Date: Sun Feb  2 14:11:34 2014
New Revision: 261401
URL: http://svnweb.freebsd.org/changeset/base/261401

Log:
  Fix newsyslog(8) to use the size of the file instead of the blocks it
  takes on disk, as advertised in newsyslog.conf(5).
  
  This fixes newsyslog(8) on ZFS with compression enabled to not have
  large files compared to the expected rotation size.
  
    # grep remotes/messages /etc/newsyslog.conf
    /var/log/remote/messages       root:info       640  5     500  *     JC
    # ls -alh /var/log/remote/messages
    -rw-r-----  1 root  info    3.2M Jan 31 20:02 /var/log/remote/messages
    # newsyslog -vN|grep remote/messages
    /var/log/remote/messages <5J>: size (Kb): 464 [500] --> skipping
    # stat -f "st_size: %z st_blocks: %b" /var/log/remote/messages
    st_size: 3372627 st_blocks: 928
    # zfs get -H compressratio zroot/syslogs
    zroot/syslogs    compressratio   3.77x   -
  
  With fix:
  
    # newsyslog -v | grep remote/messages
    /var/log/remote/messages <5J>: size (Kb): 3338 [500] --> trimming log....
  
  Approved by:	bapt (mentor)
  PR:		docs/150877
  Reported by:	Joshua Isom <jrisom@gmail.com>
  MFC after:	2 weeks

Modified:
  head/usr.sbin/newsyslog/newsyslog.c

Modified: head/usr.sbin/newsyslog/newsyslog.c
==============================================================================
--- head/usr.sbin/newsyslog/newsyslog.c	Sun Feb  2 07:28:04 2014	(r261400)
+++ head/usr.sbin/newsyslog/newsyslog.c	Sun Feb  2 14:11:34 2014	(r261401)
@@ -2284,7 +2284,7 @@ sizefile(const char *file)
 
 	if (stat(file, &sb) < 0)
 		return (-1);
-	return (kbytes(dbtob(sb.st_blocks)));
+	return (kbytes(sb.st_size));
 }
 
 /*