Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kxk7u-0001R1-MI for pgsql-hackers@arkaria.postgresql.org; Fri, 08 Jan 2021 05:15:54 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1kxk7t-0000n4-0B for pgsql-hackers@arkaria.postgresql.org; Fri, 08 Jan 2021 05:15:53 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kxk7s-0000mx-PR for pgsql-hackers@lists.postgresql.org; Fri, 08 Jan 2021 05:15:52 +0000 Received: from smtp-fw-9101.amazon.com ([207.171.184.25]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kxk7m-00013r-Gb for pgsql-hackers@postgresql.org; Fri, 08 Jan 2021 05:15:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1610082947; x=1641618947; h=to:cc:references:from:message-id:date:mime-version: in-reply-to:content-transfer-encoding:subject; bh=ml4UzS9UNcM2W7hNelLwqsrf2FryTUaP6S8SeIcNlCk=; b=o4gMq+gqcK9PmTTJaWi5V7nEkKJxIke5uZWu5yqZQ7zKW7GaE3/5/ggc O+iwo3yiCc+OBYVtlFOO6HyQT0heinXLzWkO6RQV+wdXDWae1QDF85+RR f1mqnB379Mg3xSyeqWXqTCdFq9s84zQh22mGIxRiMOdZx8TNVxiJnrdS1 Q=; X-IronPort-AV: E=Sophos;i="5.79,330,1602547200"; d="scan'208";a="102155558" Subject: Re: Add Information during standby recovery conflicts Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-1d-e69428c4.us-east-1.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-9101.sea19.amazon.com with ESMTP; 08 Jan 2021 05:15:36 +0000 Received: from EX13D03EUC003.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan2.iad.amazon.com [10.40.163.34]) by email-inbound-relay-1d-e69428c4.us-east-1.amazon.com (Postfix) with ESMTPS id B0E20C1DC2; Fri, 8 Jan 2021 05:15:33 +0000 (UTC) Received: from 38f9d36c4abb.ant.amazon.com (10.43.162.252) by EX13D03EUC003.ant.amazon.com (10.43.164.192) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 8 Jan 2021 05:15:30 +0000 To: Fujii Masao , Kyotaro Horiguchi CC: , , , References: <8c1fca5b-6c5c-df6f-0b6d-4702eeb11c5c@amazon.com> <02295c62-e90f-9bf7-63ba-1ccda204aa71@oss.nttdata.com> <20210108.111712.1465719681094712823.horikyota.ntt@gmail.com> <665ebdf3-d517-18c6-6b32-06fcdd9d6f83@oss.nttdata.com> From: "Drouvot, Bertrand" Message-ID: Date: Fri, 8 Jan 2021 06:15:26 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <665ebdf3-d517-18c6-6b32-06fcdd9d6f83@oss.nttdata.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Originating-IP: [10.43.162.252] X-ClientProxiedBy: EX13D12UWC003.ant.amazon.com (10.43.162.12) To EX13D03EUC003.ant.amazon.com (10.43.164.192) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk Hi, On 1/8/21 5:19 AM, Fujii Masao wrote: > > On 2021/01/08 11:17, Kyotaro Horiguchi wrote: >> At Fri, 8 Jan 2021 01:32:11 +0900, Fujii Masao >> wrote in >>> >>> Attached is the updated version of the patch. This can be applied to >>> current master. >>> >>> With the patch, for example, if the startup process waited longer than >>> deadlock_timeout for the recovery conflict on the lock, the latter log >>> message in the followings would be additionally output. >>> >>>      LOG: recovery still waiting after 1001.223 ms: recovery >>> conflict on >>>      lock >>>      LOG: recovery finished waiting after 19004.694 ms: recovery >>> conflict >>>      on lock >> >> +                     /* >> +                      * Emit the log message if recovery conflict on >> buffer pin was resolved but >> +                      * the startup process waited longer than >> deadlock_timeout for it. >> >> The first line is beyond the 80th column. > > Thanks for pointing out this! This happened because I forgot to run > pgindent > for bufmgr.c. Attached is the updated version of the patch. The patch looks good to me. Bertrand