Обсуждение: pgsql: action_at_recovery_target recovery config option
action_at_recovery_target recovery config option action_at_recovery_target = pause | promote | shutdown Petr Jelinek Reviewed by Muhammad Asif Naeem, Fujji Masao and Simon Riggs Branch ------ master Details ------- http://git.postgresql.org/pg/commitdiff/aedccb1f6fef988af1d1a25b78151f3773954b4c Modified Files -------------- doc/src/sgml/recovery-config.sgml | 58 ++++++++++++++++++--- src/backend/access/transam/xlog.c | 98 +++++++++++++++++++++++++++++++---- src/backend/postmaster/postmaster.c | 12 +++++ src/include/access/xlog_internal.h | 10 ++++ 4 files changed, 159 insertions(+), 19 deletions(-)
On 11/25/2014 09:14 PM, Simon Riggs wrote: > action_at_recovery_target recovery config option > > action_at_recovery_target = pause | promote | shutdown > > Petr Jelinek > > Reviewed by Muhammad Asif Naeem, Fujji Masao and > Simon Riggs > > Branch > ------ > master > > Details > ------- > http://git.postgresql.org/pg/commitdiff/aedccb1f6fef988af1d1a25b78151f3773954b4c > > Modified Files > -------------- > doc/src/sgml/recovery-config.sgml | 58 ++++++++++++++++++--- > src/backend/access/transam/xlog.c | 98 +++++++++++++++++++++++++++++++---- > src/backend/postmaster/postmaster.c | 12 +++++ > src/include/access/xlog_internal.h | 10 ++++ > 4 files changed, 159 insertions(+), 19 deletions(-) looks like this broke the docs build: http://www.pgbuildfarm.org/cgi-bin/show_log.pl?nm=guaibasaurus&dt=2014-11-25%2020%3A17%3A01 Stefan
On 25 November 2014 at 21:40, Stefan Kaltenbrunner <stefan@kaltenbrunner.cc> wrote: > On 11/25/2014 09:14 PM, Simon Riggs wrote: >> action_at_recovery_target recovery config option >> >> action_at_recovery_target = pause | promote | shutdown >> >> Petr Jelinek >> >> Reviewed by Muhammad Asif Naeem, Fujji Masao and >> Simon Riggs >> >> Branch >> ------ >> master >> >> Details >> ------- >> http://git.postgresql.org/pg/commitdiff/aedccb1f6fef988af1d1a25b78151f3773954b4c >> >> Modified Files >> -------------- >> doc/src/sgml/recovery-config.sgml | 58 ++++++++++++++++++--- >> src/backend/access/transam/xlog.c | 98 +++++++++++++++++++++++++++++++---- >> src/backend/postmaster/postmaster.c | 12 +++++ >> src/include/access/xlog_internal.h | 10 ++++ >> 4 files changed, 159 insertions(+), 19 deletions(-) > > > looks like this broke the docs build: > > http://www.pgbuildfarm.org/cgi-bin/show_log.pl?nm=guaibasaurus&dt=2014-11-25%2020%3A17%3A01 Thanks, hopefully fixed soon afterwards. -- Simon Riggs http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Training & Services
On Wed, Nov 26, 2014 at 7:33 AM, Simon Riggs <simon@2ndquadrant.com> wrote:
> On 25 November 2014 at 21:40, Stefan Kaltenbrunner
> <stefan@kaltenbrunner.cc> wrote:
>> On 11/25/2014 09:14 PM, Simon Riggs wrote:
>>> action_at_recovery_target recovery config option
>>>
>>> action_at_recovery_target = pause | promote | shutdown
>>>
>>> Petr Jelinek
>>>
>>> Reviewed by Muhammad Asif Naeem, Fujji Masao and
>>> Simon Riggs
>>>
>>> Branch
>>> ------
>>> master
>>>
>>> Details
>>> -------
>>> http://git.postgresql.org/pg/commitdiff/aedccb1f6fef988af1d1a25b78151f3773954b4c
>>>
>>> Modified Files
>>> --------------
>>> doc/src/sgml/recovery-config.sgml | 58 ++++++++++++++++++---
>>> src/backend/access/transam/xlog.c | 98 +++++++++++++++++++++++++++++++----
>>> src/backend/postmaster/postmaster.c | 12 +++++
>>> src/include/access/xlog_internal.h | 10 ++++
>>> 4 files changed, 159 insertions(+), 19 deletions(-)
>>
>>
>> looks like this broke the docs build:
>>
>> http://www.pgbuildfarm.org/cgi-bin/show_log.pl?nm=guaibasaurus&dt=2014-11-25%2020%3A17%3A01
>
> Thanks, hopefully fixed soon afterwards.
That's still broken even after you pushed b7a7158 (blind commit?) as a tentative to fix it:
openjade:recovery-config.sgml:319:8:E: character data is not allowed here
openjade:recovery-config.sgml:319:36:E: document type does not allow element "LITERAL" here; missing one of "REMARK", "SYNOPSIS", "LITERALLAYOUT", "PROGRAMLISTING", "SCREEN", "PARA", "SIMPARA", "BRIDGEHEAD" start-tag
openjade:recovery-config.sgml:319:46:E: character data is not allowed here
openjade:recovery-config.sgml:322:23:E: document type does not allow element "FUNCTION" here; missing one of "REMARK", "SYNOPSIS", "LITERALLAYOUT", "PROGRAMLISTING", "SCREEN", "PARA", "SIMPARA", "BRIDGEHEAD" start-tag
openjade:recovery-config.sgml:322:51:E: character data is not allowed here
openjade:recovery-config.sgml:323:56:E: document type does not allow element "XREF" here; missing one of "REMARK", "SYNOPSIS", "LITERALLAYOUT", "PROGRAMLISTING", "SCREEN", "PARA", "SIMPARA", "BRIDGEHEAD" start-tag
openjade:recovery-config.sgml:328:13:E: end tag for element "PARA" which is not open
The docs are able to compile correctly with the patch attached, you simply missed a <para>.
Thanks,
--
Michael
Вложения
On 26 November 2014 at 00:38, Michael Paquier <michael.paquier@gmail.com> wrote: > > > On Wed, Nov 26, 2014 at 7:33 AM, Simon Riggs <simon@2ndquadrant.com> wrote: >> On 25 November 2014 at 21:40, Stefan Kaltenbrunner >> <stefan@kaltenbrunner.cc> wrote: >>> On 11/25/2014 09:14 PM, Simon Riggs wrote: >>>> action_at_recovery_target recovery config option >>>> >>>> action_at_recovery_target = pause | promote | shutdown >>>> >>>> Petr Jelinek >>>> >>>> Reviewed by Muhammad Asif Naeem, Fujji Masao and >>>> Simon Riggs >>>> >>>> Branch >>>> ------ >>>> master >>>> >>>> Details >>>> ------- >>>> >>>> http://git.postgresql.org/pg/commitdiff/aedccb1f6fef988af1d1a25b78151f3773954b4c >>>> >>>> Modified Files >>>> -------------- >>>> doc/src/sgml/recovery-config.sgml | 58 ++++++++++++++++++--- >>>> src/backend/access/transam/xlog.c | 98 >>>> +++++++++++++++++++++++++++++++---- >>>> src/backend/postmaster/postmaster.c | 12 +++++ >>>> src/include/access/xlog_internal.h | 10 ++++ >>>> 4 files changed, 159 insertions(+), 19 deletions(-) >>> >>> >>> looks like this broke the docs build: >>> >>> >>> http://www.pgbuildfarm.org/cgi-bin/show_log.pl?nm=guaibasaurus&dt=2014-11-25%2020%3A17%3A01 >> >> Thanks, hopefully fixed soon afterwards. > That's still broken even after you pushed b7a7158 (blind commit?) as a > tentative to fix it: > openjade:recovery-config.sgml:319:8:E: character data is not allowed here > openjade:recovery-config.sgml:319:36:E: document type does not allow element > "LITERAL" here; missing one of "REMARK", "SYNOPSIS", "LITERALLAYOUT", > "PROGRAMLISTING", "SCREEN", "PARA", "SIMPARA", "BRIDGEHEAD" start-tag > openjade:recovery-config.sgml:319:46:E: character data is not allowed here > openjade:recovery-config.sgml:322:23:E: document type does not allow element > "FUNCTION" here; missing one of "REMARK", "SYNOPSIS", "LITERALLAYOUT", > "PROGRAMLISTING", "SCREEN", "PARA", "SIMPARA", "BRIDGEHEAD" start-tag > openjade:recovery-config.sgml:322:51:E: character data is not allowed here > openjade:recovery-config.sgml:323:56:E: document type does not allow element > "XREF" here; missing one of "REMARK", "SYNOPSIS", "LITERALLAYOUT", > "PROGRAMLISTING", "SCREEN", "PARA", "SIMPARA", "BRIDGEHEAD" start-tag > openjade:recovery-config.sgml:328:13:E: end tag for element "PARA" which is > not open > > The docs are able to compile correctly with the patch attached, you simply > missed a <para>. > Thanks, Thanks, will apply. -- Simon Riggs http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Training & Services
On 26 November 2014 at 12:37, Simon Riggs <simon@2ndquadrant.com> wrote: >> The docs are able to compile correctly with the patch attached, you simply >> missed a <para>. >> Thanks, > > Thanks, will apply. Ah, Peter fixed it already. Sorry, I'm having email problems here. -- Simon Riggs http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Training & Services