Skip to content

Commit 626cebe

Browse files
authored
Update docs Makefile, remove old crufts from the recent merge. (#940)
The new latexmk in current TexLive distribution has changed the way parameters are processed: the file.pdf output should not be part of the command line anymore.
1 parent 1852d43 commit 626cebe

14 files changed

+1223
-1889
lines changed

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,12 @@ spellcheck:
213213
black --check .
214214
ci/banned.h.sh
215215

216-
docs: $(FSM)
216+
docs: $(FSM) tikz
217217
$(MAKE) -C docs html
218218

219+
tikz:
220+
$(MAKE) -C docs/tikz all
221+
219222
interactive-test:
220223
docker run --name $(CONTAINER_NAME) --rm -ti $(CONTAINER_NAME)
221224

@@ -301,7 +304,7 @@ run-installcheck-i386: build-i386
301304
man:
302305
$(MAKE) -C docs man
303306

304-
pdf: $(PDF)
307+
pdf: $(PDF) ;
305308

306309
$(PDF):
307310
$(MAKE) -s -C docs/tikz pdf
@@ -409,7 +412,7 @@ az: all
409412
azdrop: all
410413
$(PG_AUTOCTL) do azure drop
411414

412-
.PHONY: all clean check install docs
415+
.PHONY: all clean check install docs tikz
413416
.PHONY: monitor clean-monitor check-monitor install-monitor
414417
.PHONY: bin clean-bin install-bin
415418
.PHONY: build-test run-test spellcheck lint linting ci-test

docs/failover-state-machine.rst

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -274,33 +274,6 @@ entry. If a node is not reporting anymore, maybe because it's completely
274274
unavailable, then it's possible to run the ``pg_autoctl drop node --force``
275275
command, and then the node entry is removed from the monitor.
276276

277-
Failover logic
278-
--------------
279-
280-
This section needs to be expanded further, but below is the failover state
281-
machine for each node that is implemented by the monitor:
282-
283-
.. figure:: ./fsm/node-state-machine.png
284-
:scale: 30%
285-
:alt: Node state machine
286-
287-
Node state machine
288-
289-
Since the state machines of the data nodes always move in tandem, a pair
290-
(group) of data nodes also implicitly has the following state machine:
291-
292-
.. figure:: ./fsm/group-state-machine.png
293-
:scale: 40%
294-
:alt: Group state machine
295-
296-
Group state machine
297-
298-
.. raw:: latex
299-
300-
\newpage
301-
302-
.. _state_machine_diagram:
303-
304277
pg_auto_failover keeper's State Machine
305278
---------------------------------------
306279

docs/fsm.png

-50.4 KB
Loading

docs/fsm/README

Lines changed: 0 additions & 4 deletions
This file was deleted.

docs/fsm/group-state-machine

Lines changed: 0 additions & 60 deletions
This file was deleted.

docs/fsm/group-state-machine.png

-48.3 KB
Binary file not shown.

docs/fsm/node-state-machine

Lines changed: 0 additions & 54 deletions
This file was deleted.

docs/fsm/node-state-machine.png

-115 KB
Binary file not shown.

docs/tikz/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ clean:
1616
rm -rf $(PNG)
1717

1818
%.pdf: %.tex common.tex
19-
latexmk -silent -lualatex --interaction=nonstopmode -shell-escape $< $@
19+
latexmk -silent -lualatex --interaction=nonstopmode -shell-escape $<
2020
latexmk -c
2121

2222
%.png: %.pdf

0 commit comments

Comments
 (0)