marsadm: clarify timestamps via macros p3

This commit is contained in:
Thomas Schoebel-Theuer 2015-02-11 12:16:55 +01:00
parent 614d634e6e
commit 857c7a6cff
2 changed files with 46 additions and 1 deletions

View File

@ -6282,6 +6282,19 @@ primarynode
macro below.
\end_layout
\begin_layout Labeling
\labelwidthstring 00.00.0000
\family typewriter
%include{commstate}
\family default
see
\family typewriter
commstate
\family default
macro below.
\end_layout
\end_deeper
\begin_layout Labeling
\labelwidthstring 00.00.0000
@ -6927,6 +6940,32 @@ primarynode-1and1
\begin_layout Labeling
\labelwidthstring 00.00.0000
\family typewriter
commstate
\family default
When the last metadata communication to the designated primary is longer
ago than
\family typewriter
${window}
\family default
(see also
\family typewriter
--window=
\emph on
seconds
\family default
\emph default
option), display that age in human readable form.
See also primitive macro
\family typewriter
%alive-age{}
\family default
.
\end_layout
\begin_layout Labeling
\labelwidthstring 00.00.0000
\family typewriter
syncinfo
\family default

View File

@ -3349,7 +3349,7 @@ my %complex_macros =
(
"default" =>
=> "%if{%{res}}{"
. " %{res} %include{diskstate} %include{replstate} %include{flags} %include{role} %include{primarynode}\n"
. " %{res} %include{diskstate} %include{replstate} %include{flags} %include{role} %include{primarynode} %include{commstate}\n"
. "%if{%and{%is-attach{}}{%not{%sync-reached{}}}}{"
. "%include{syncinfo}"
. "}"
@ -3523,6 +3523,12 @@ my %complex_macros =
. "}"
. "}{-}",
"commstate"
=> "%let{comm}{%alive-age{}}"
. "%if{%>={%{comm}}{%{window}}}{"
. "%human-seconds{%{comm}}"
. "}",
"syncinfo"
=> "%let{amount}{%human-numbers{}{ }{ }{%sync-pos{}}{%sync-size{}}}"
. "%let{rate}{%human-numbers{}{ }{ }{%sync-rate{}}}"