From owner-svn-src-stable-10@freebsd.org Fri Feb 10 17:47:48 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2721CD88ED; Fri, 10 Feb 2017 17:47:48 +0000 (UTC) (envelope-from delphij@gmail.com) Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 58D23F6E; Fri, 10 Feb 2017 17:47:48 +0000 (UTC) (envelope-from delphij@gmail.com) Received: by mail-wm0-x241.google.com with SMTP id r18so8447035wmd.3; Fri, 10 Feb 2017 09:47:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=3Uad6M1MqMRQ19t7dLuBwWA6ajDWei43CrDJRz575yI=; b=ZzTknZOhMD1CmcDP4PbDJdSoQ0CeIN8Buv/7GTNzf3GGe7LYRxhyjZ55kGQjKoPH74 pG4t1ldFKS/92AgwoWVsSAZsJOLbNSW/+sFY3/EeMRcPB14Qb9VqRU6w/oWWLSNjA1/i aT98f8hr85qxIUL0X7umQ1iqBA0n0+o0mUeFhiWvy2x+56GILvuJSRdHXt2G6xgbIEdh xnsYilekOUqDbGQxB7gfE6HU24GpC8ZiwpadmynQl36E+zs6QFYntVcTkY8/XcbH+5rT XWELwctdgwTsIVm0Lj/kq/CXqx+zUplVQzZmPbUGYJXklpt+sGMDKV56wKw/Nhvnal8D +Sag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=3Uad6M1MqMRQ19t7dLuBwWA6ajDWei43CrDJRz575yI=; b=JADrjI7vPMpXw+3a/ulqEUaqTncsc0X8ud/LY2QkOFNyulPPnAoJbgqnC7fCbDHlB9 lryhYeE/N+cdwk6HENuce6iK8R7s7VNWs4B6mX6IW1HOJSK0s3JHbaLTcWf+1BXMklY8 y3cmM6Wa6Wf2+0PZMq86JHdbSWTOG4intgKuFt3FrrvAbfYU7RF8OTKXSbwPgB3dDOI7 /xotK5efqb8b2qq1AMPfEqppxFXCvL7Gg5Qvgcw66NpcX571R8L6osLe/mgmdU/7iqMs IeXtLidGf0VJp4g8IZR1eQPADHJZE5Sva3dP7DvX5GmPKvWKDfBSoQ7zqapgw/R91tq1 HL3g== X-Gm-Message-State: AMke39lx7ji7J9ioTFyUb20VZ8sQlgEY8FFkWa+1Wu6pUG8Ek/rGZbge5KQE6ALBsy6nmpAeKd3CgFE2k7XCJw== X-Received: by 10.28.158.213 with SMTP id h204mr5169454wme.0.1486748866447; Fri, 10 Feb 2017 09:47:46 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.68.67 with HTTP; Fri, 10 Feb 2017 09:47:45 -0800 (PST) In-Reply-To: <6930dc08-d5b3-5383-eb30-54d92767d43e@FreeBSD.org> References: <201702100653.v1A6rmL9009347@repo.freebsd.org> <1486743003.10020.242.camel@freebsd.org> <6930dc08-d5b3-5383-eb30-54d92767d43e@FreeBSD.org> From: Xin LI Date: Fri, 10 Feb 2017 09:47:45 -0800 Message-ID: Subject: Re: svn commit: r313533 - stable/10/usr.sbin/watchdogd To: Andriy Gapon Cc: Ian Lepore , Xin LI , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2017 17:47:48 -0000 Hi, Andriy, Yes you did MFC'ed the changes. The original change was intended for stable/10 but I probably have been disrupted when the MFC notification come in. Cheers, On Fri, Feb 10, 2017 at 8:32 AM, Andriy Gapon wrote: > On 10/02/2017 18:10, Ian Lepore wrote: >> On Fri, 2017-02-10 at 06:53 +0000, Xin LI wrote: >>> Author: delphij >>> Date: Fri Feb 10 06:53:48 2017 >>> New Revision: 313533 >>> URL: https://svnweb.freebsd.org/changeset/base/313533 >>> >>> Log: >>> MFC r274583: Default to use 10 seconds as nap interval instead of >>> 1. >>> >>> Modified: >>> stable/10/usr.sbin/watchdogd/watchdogd.8 >>> stable/10/usr.sbin/watchdogd/watchdogd.c >>> >> >> I didn't see this change when it happened on -current, but my burning >> question now is: how will this work when the timeout is set to values >> less than 10 seconds, which is the only option on some hardware? > > Please see r308040 and r308479. > I don't recall right now if I MFC-ed them to stable/10. > >> >>> Modified: stable/10/usr.sbin/watchdogd/watchdogd.8 >>> ===================================================================== >>> ========= >>> --- stable/10/usr.sbin/watchdogd/watchdogd.8 Fri Feb 10 >>> 06:34:52 2017 (r313532) >>> +++ stable/10/usr.sbin/watchdogd/watchdogd.8 Fri Feb 10 >>> 06:53:48 2017 (r313533) >>> @@ -80,7 +80,7 @@ reboot if there are problems with the sc >>> The >>> .Fl s Ar sleep >>> argument can be used to control the sleep period between each >>> execution >>> -of the check and defaults to one second. >>> +of the check and defaults to 10 seconds. >>> .Pp >>> The >>> .Fl t Ar timeout >>> >>> Modified: stable/10/usr.sbin/watchdogd/watchdogd.c >>> ===================================================================== >>> ========= >>> --- stable/10/usr.sbin/watchdogd/watchdogd.c Fri Feb 10 >>> 06:34:52 2017 (r313532) >>> +++ stable/10/usr.sbin/watchdogd/watchdogd.c Fri Feb 10 >>> 06:53:48 2017 (r313533) >>> @@ -80,7 +80,7 @@ static u_int timeout = WD_TO_128SEC; >>> static u_int exit_timeout = WD_TO_NEVER; >>> static u_int pretimeout = 0; >>> static u_int timeout_sec; >>> -static u_int nap = 1; >>> +static u_int nap = 10; >>> static int passive = 0; >>> static int is_daemon = 0; >>> static int is_dry_run = 0; /* do not arm the watchdog, only >>> >> > > > -- > Andriy Gapon