From owner-svn-src-releng@FreeBSD.ORG Sun Mar 31 18:51:35 2013 Return-Path: Delivered-To: svn-src-releng@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 B751C70C; Sun, 31 Mar 2013 18:51:35 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9B232A14; Sun, 31 Mar 2013 18:51:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VIpZQ9051052; Sun, 31 Mar 2013 18:51:35 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2VIpY4q051049; Sun, 31 Mar 2013 18:51:34 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201303311851.r2VIpY4q051049@svn.freebsd.org> From: Martin Matuska Date: Sun, 31 Mar 2013 18:51:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248957 - in releng/8.4/cddl/contrib/opensolaris/cmd: zdb zpool X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Mar 2013 18:51:35 -0000 Author: mm Date: Sun Mar 31 18:51:34 2013 New Revision: 248957 URL: http://svnweb.freebsd.org/changeset/base/248957 Log: MFC r248267: Import minor ZFS changes from vendor Illumos ZFS issues: 3604 zdb should print bpobjs more verbosely (fix zdb hang) 3606 zpool status -x shouldn't warn about old on-disk format Approved by: re (marius) Modified: releng/8.4/cddl/contrib/opensolaris/cmd/zdb/zdb.c releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool.8 releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Directory Properties: releng/8.4/cddl/contrib/opensolaris/ (props changed) Modified: releng/8.4/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- releng/8.4/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sun Mar 31 18:39:11 2013 (r248956) +++ releng/8.4/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sun Mar 31 18:51:34 2013 (r248957) @@ -1225,6 +1225,7 @@ dump_bpobj(bpobj_t *bpo, char *name, int continue; } dump_bpobj(&subbpo, "subobj", indent + 1); + bpobj_close(&subbpo); } } else { (void) printf(" %*s: object %llu, %llu blkptrs, %s\n", Modified: releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Sun Mar 31 18:39:11 2013 (r248956) +++ releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Sun Mar 31 18:51:34 2013 (r248957) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 15, 2012 +.Dd March 14, 2013 .Dt ZPOOL 8 .Os .Sh NAME @@ -1608,14 +1608,15 @@ is specified, the command exits after .Ar count reports are printed. .Pp -If a scrub or resilver is in progress, this command reports the percentage done -and the estimated time to completion. Both of these are only approximate, +If a scrub or resilver is in progress, this command reports the percentage +done and the estimated time to completion. Both of these are only approximate, because the amount of data in the pool and the other workloads on the system can change. .Bl -tag -width indent .It Fl x Only display status for pools that are exhibiting errors or are otherwise unavailable. +Warnings about pools not using the latest on-disk format will not be included. .It Fl v Displays verbose data error information, printing out a complete list of all data errors since the last complete pool scrub. Modified: releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Mar 31 18:39:11 2013 (r248956) +++ releng/8.4/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Mar 31 18:51:34 2013 (r248957) @@ -4030,7 +4030,10 @@ status_callback(zpool_handle_t *zhp, voi * If we were given 'zpool status -x', only report those pools with * problems. */ - if (reason == ZPOOL_STATUS_OK && cbp->cb_explain) { + if (cbp->cb_explain && + (reason == ZPOOL_STATUS_OK || + reason == ZPOOL_STATUS_VERSION_OLDER || + reason == ZPOOL_STATUS_FEAT_DISABLED)) { if (!cbp->cb_allpools) { (void) printf(gettext("pool '%s' is healthy\n"), zpool_get_name(zhp));