Received: from maia.hub.org (unknown [200.46.208.211]) by mail.postgresql.org (Postfix) with ESMTP id 51793633607 for ; Wed, 24 Mar 2010 10:20:58 -0300 (ADT) Received: from mail.postgresql.org ([200.46.204.86]) by maia.hub.org (mx1.hub.org [200.46.208.211]) (amavisd-maia, port 10024) with ESMTP id 90169-04 for ; Wed, 24 Mar 2010 13:20:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-gw0-f46.google.com (mail-gw0-f46.google.com [74.125.83.46]) by mail.postgresql.org (Postfix) with ESMTP id 922D16330B4 for ; Wed, 24 Mar 2010 10:20:47 -0300 (ADT) Received: by gwaa18 with SMTP id a18so1978641gwa.19 for ; Wed, 24 Mar 2010 06:20:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=/TtQEMNNlJCLHCMEHiSbAZJcRToXbqgQfjedFgrMcjo=; b=WPWUu8Vi+xWP7CeX2/Efq9duZKmHNIqMmkA50bBvOMqFXI1aPx4Zz1y+IqqRmaG4+b O4mcr8yjp7HQwbDs6xEQEwDhqbm+piuLRhMtIIxxCf1n9JGl+jws233oDEasb6i/6nR5 1VBhBY0EETG/PaYA2LBDdztPx8Fozo5AtUNdY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=kVlFK8Xv+pGEgjr7FRABseT9HmYZe0XkFuFwa/dWxqvR5/+VYDcaQABflga/C6kZ9U if7QGy+gHQty8KoZeNQy0LOsICWxqN95XxSfPqN3nq2Y8xHe1PEt43Rf3RpArQIvbbi4 9ERjZ1mYlYb0g0GbnyQC5LbF5i9off6UnOb4o= MIME-Version: 1.0 Received: by 10.101.205.27 with SMTP id h27mr13525159anq.192.1269436845730; Wed, 24 Mar 2010 06:20:45 -0700 (PDT) In-Reply-To: <4BAA060A.2020000@enterprisedb.com> References: <3f0b79eb1002092105r21e009d3v468496058ba04392@mail.gmail.com> <20100211144204.GC14128@oak.highrise.ca> <4B743E7D.5070603@enterprisedb.com> <3f0b79eb1002180337t1fab1395ve3491256672af15f@mail.gmail.com> <4BA0B079.3050301@enterprisedb.com> <3f0b79eb1003180727g7877743eq81274e014fe70a49@mail.gmail.com> <1268988724.3556.3.camel@ebony> <4BA361E4.7020309@enterprisedb.com> <3f0b79eb1003230017v16f4ecbeyc20e75beeffe8f1c@mail.gmail.com> <4BAA060A.2020000@enterprisedb.com> Date: Wed, 24 Mar 2010 22:20:45 +0900 Message-ID: <3f0b79eb1003240620h209a0a40ud2063728b5db31a6@mail.gmail.com> Subject: Re: Re: [COMMITTERS] pgsql: Make standby server continuously retry restoring the next WAL From: Fujii Masao To: Heikki Linnakangas Cc: Simon Riggs , Aidan Van Dyk , PostgreSQL-development Content-Type: multipart/mixed; boundary=0016e68ee24c412cff04828bcc87 X-Virus-Scanned: Maia Mailguard 1.0.1 X-Spam-Status: No, hits=-2.19 tagged_above=-10 required=5 tests=AWL=0.409, BAYES_00=-2.599 X-Spam-Level: X-Archive-Number: 201003/978 X-Sequence-Number: 159754 --0016e68ee24c412cff04828bcc87 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Wed, Mar 24, 2010 at 9:31 PM, Heikki Linnakangas wrote: > Hmm, true, this changes behavior over previous releases. I tend to think > that it's always an error if there's a corrupt file in the archive, > though, and PANIC is appropriate. If the administrator wants to start up > the database anyway, he can remove the corrupt file from the archive and > place it directly in pg_xlog instead. Okay. > Thanks. That's easily fixable (applies over the previous patch): > > --- a/src/backend/access/transam/xlog.c > +++ b/src/backend/access/transam/xlog.c > @@ -3773,7 +3773,7 @@ retry: > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pagelsn.xrecoff =3D 0; > =A0 =A0 =A0 =A0 =A0 =A0} > =A0 =A0 =A0 =A0 =A0 =A0/* Wait for the next page to become available */ > - =A0 =A0 =A0 =A0 =A0 if (!XLogPageRead(&pagelsn, emode, false, false)) > + =A0 =A0 =A0 =A0 =A0 if (!XLogPageRead(&pagelsn, emode_arg, false, false= )) > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return NULL; > > =A0 =A0 =A0 =A0 =A0 =A0/* Check that the continuation record looks valid = */ Seems correct. > sources &=3D ~failedSources; > failedSources |=3D readSource; The above lines in XLogPageRead() seem not to be required in normal recovery case (i.e., standby_mode =3D off). So how about the attached patch? Regards, --=20 Fujii Masao NIPPON TELEGRAPH AND TELEPHONE CORPORATION NTT Open Source Software Center --0016e68ee24c412cff04828bcc87 Content-Type: application/octet-stream; name="failedSource_v1.patch" Content-Disposition: attachment; filename="failedSource_v1.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g765lt4o0 KioqIGEvc3JjL2JhY2tlbmQvYWNjZXNzL3RyYW5zYW0veGxvZy5jCi0tLSBiL3NyYy9iYWNrZW5k L2FjY2Vzcy90cmFuc2FtL3hsb2cuYwoqKioqKioqKioqKioqKioKKioqIDg5NDMsODk0OSAqKioq IHJldHJ5OgogIAkJCQlzb3VyY2VzID0gWExPR19GUk9NX1BHX1hMT0c7CiAgCQkJCWlmIChJbkFy Y2hpdmVSZWNvdmVyeSkKICAJCQkJCXNvdXJjZXMgfD0gWExPR19GUk9NX0FSQ0hJVkU7Ci0gCQkJ CXNvdXJjZXMgJj0gfmZhaWxlZFNvdXJjZXM7CiAgCiAgCQkJCXJlYWRGaWxlID0gWExvZ0ZpbGVS ZWFkQW55VExJKHJlYWRJZCwgcmVhZFNlZywgZW1vZGVfYXJnLAogIAkJCQkJCQkJCQkJICBzb3Vy Y2VzKTsKLS0tIDg5NDMsODk0OCAtLS0tCioqKioqKioqKioqKioqKgoqKiogOTA0MSw5MDQ4ICoq KiogcmV0cnk6CiAgCXJldHVybiB0cnVlOwogIAogIG5leHRfcmVjb3JkX2lzX2ludmFsaWQ6Ci0g CWZhaWxlZFNvdXJjZXMgfD0gcmVhZFNvdXJjZTsKLSAKICAJaWYgKHJlYWRGaWxlID49IDApCiAg CQljbG9zZShyZWFkRmlsZSk7CiAgCXJlYWRGaWxlID0gLTE7Ci0tLSA5MDQwLDkwNDUgLS0tLQoq KioqKioqKioqKioqKioKKioqIDkwNTAsOTA1NiAqKioqIG5leHRfcmVjb3JkX2lzX2ludmFsaWQ6 Ci0tLSA5MDQ3LDkwNTYgLS0tLQogIAlyZWFkU291cmNlID0gMDsKICAKICAJaWYgKFN0YW5kYnlN b2RlKQorIAl7CisgCQlmYWlsZWRTb3VyY2VzIHw9IHJlYWRTb3VyY2U7CiAgCQlnb3RvIHJldHJ5 OworIAl9CiAgCWVsc2UKICAJCXJldHVybiBmYWxzZTsKICAK --0016e68ee24c412cff04828bcc87--