public inbox for [email protected]
help / color / mirror / Atom feed[PATCH 1/5] pg_rewind: Move syncTargetDirectory() to file_ops.c
4+ messages / 3 participants
[nested] [flat]
* [PATCH 1/5] pg_rewind: Move syncTargetDirectory() to file_ops.c
@ 2020-08-19 12:34 Heikki Linnakangas <[email protected]>
0 siblings, 0 replies; 4+ messages in thread
From: Heikki Linnakangas @ 2020-08-19 12:34 UTC (permalink / raw)
For consistency. All the other low-level functions that operate on the
target directory are in file_ops.c.
---
src/bin/pg_rewind/file_ops.c | 19 +++++++++++++++++++
src/bin/pg_rewind/file_ops.h | 1 +
src/bin/pg_rewind/pg_rewind.c | 22 +---------------------
src/bin/pg_rewind/pg_rewind.h | 1 +
4 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/bin/pg_rewind/file_ops.c b/src/bin/pg_rewind/file_ops.c
index b3bf091c546..55439db20ba 100644
--- a/src/bin/pg_rewind/file_ops.c
+++ b/src/bin/pg_rewind/file_ops.c
@@ -19,6 +19,7 @@
#include <unistd.h>
#include "common/file_perm.h"
+#include "common/file_utils.h"
#include "file_ops.h"
#include "filemap.h"
#include "pg_rewind.h"
@@ -266,6 +267,24 @@ remove_target_symlink(const char *path)
dstpath);
}
+/*
+ * Sync target data directory to ensure that modifications are safely on disk.
+ *
+ * We do this once, for the whole data directory, for performance reasons. At
+ * the end of pg_rewind's run, the kernel is likely to already have flushed
+ * most dirty buffers to disk. Additionally fsync_pgdata uses a two-pass
+ * approach (only initiating writeback in the first pass), which often reduces
+ * the overall amount of IO noticeably.
+ */
+void
+sync_target_dir(void)
+{
+ if (!do_sync || dry_run)
+ return;
+
+ fsync_pgdata(datadir_target, PG_VERSION_NUM);
+}
+
/*
* Read a file into memory. The file to be read is <datadir>/<path>.
diff --git a/src/bin/pg_rewind/file_ops.h b/src/bin/pg_rewind/file_ops.h
index 025f24141c9..d8466385cf5 100644
--- a/src/bin/pg_rewind/file_ops.h
+++ b/src/bin/pg_rewind/file_ops.h
@@ -19,6 +19,7 @@ extern void remove_target_file(const char *path, bool missing_ok);
extern void truncate_target_file(const char *path, off_t newsize);
extern void create_target(file_entry_t *t);
extern void remove_target(file_entry_t *t);
+extern void sync_target_dir(void);
extern char *slurpFile(const char *datadir, const char *path, size_t *filesize);
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 23fc749e445..c9b9e480c0f 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -20,7 +20,6 @@
#include "catalog/pg_control.h"
#include "common/controldata_utils.h"
#include "common/file_perm.h"
-#include "common/file_utils.h"
#include "common/restricted_token.h"
#include "common/string.h"
#include "fe_utils/recovery_gen.h"
@@ -38,7 +37,6 @@ static void createBackupLabel(XLogRecPtr startpoint, TimeLineID starttli,
static void digestControlFile(ControlFileData *ControlFile, char *source,
size_t size);
-static void syncTargetDirectory(void);
static void getRestoreCommand(const char *argv0);
static void sanityChecks(void);
static void findCommonAncestorTimeline(XLogRecPtr *recptr, int *tliIndex);
@@ -455,7 +453,7 @@ main(int argc, char **argv)
if (showprogress)
pg_log_info("syncing target data directory");
- syncTargetDirectory();
+ sync_target_dir();
if (writerecoveryconf && !dry_run)
WriteRecoveryConfig(conn, datadir_target,
@@ -803,24 +801,6 @@ digestControlFile(ControlFileData *ControlFile, char *src, size_t size)
checkControlFile(ControlFile);
}
-/*
- * Sync target data directory to ensure that modifications are safely on disk.
- *
- * We do this once, for the whole data directory, for performance reasons. At
- * the end of pg_rewind's run, the kernel is likely to already have flushed
- * most dirty buffers to disk. Additionally fsync_pgdata uses a two-pass
- * approach (only initiating writeback in the first pass), which often reduces
- * the overall amount of IO noticeably.
- */
-static void
-syncTargetDirectory(void)
-{
- if (!do_sync || dry_run)
- return;
-
- fsync_pgdata(datadir_target, PG_VERSION_NUM);
-}
-
/*
* Get value of GUC parameter restore_command from the target cluster.
*
diff --git a/src/bin/pg_rewind/pg_rewind.h b/src/bin/pg_rewind/pg_rewind.h
index 8a9319ed675..67f90c2a38c 100644
--- a/src/bin/pg_rewind/pg_rewind.h
+++ b/src/bin/pg_rewind/pg_rewind.h
@@ -24,6 +24,7 @@ extern char *datadir_source;
extern char *connstr_source;
extern bool showprogress;
extern bool dry_run;
+extern bool do_sync;
extern int WalSegSz;
/* Target history */
--
2.20.1
--------------D93EDEBFB124D563B723F4BD
Content-Type: text/x-patch; charset=UTF-8;
name="0002-Refactor-pg_rewind-for-more-clear-decision-making.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0002-Refactor-pg_rewind-for-more-clear-decision-making.patch"
^ permalink raw reply [nested|flat] 4+ messages in thread
* Make fop less verbose when building PDF
@ 2023-03-24 19:47 Andres Freund <[email protected]>
2023-03-24 20:19 ` Re: Make fop less verbose when building PDF Tom Lane <[email protected]>
0 siblings, 1 reply; 4+ messages in thread
From: Andres Freund @ 2023-03-24 19:47 UTC (permalink / raw)
To: pgsql-hackers
Hi,
When building the pdf docs, fop emits a line for each page of the docs:
> ...
> [INFO] FOUserAgent - Rendered page #2931.
which, given the length of our docs, makes the output pretty pointless. Even
if there are warnings, one likely won't notice them.
I just figured out that one can hide those. Unfortunately not at the
commandline, but in "$HOME/.foprc" or /etc.
$ cat ~/.foprc
LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=WARN
makes it a lot less annoying. And one can see that we currently are getting
warnings:
[warning] /usr/bin/fop: JVM flavor 'sun' not understood
[WARN] FOUserAgent - Font "Symbol,normal,700" not found. Substituting with "Symbol,normal,400".
[WARN] FOUserAgent - Font "ZapfDingbats,normal,700" not found. Substituting with "ZapfDingbats,normal,400".
[WARN] FOUserAgent - The contents of fo:block line 2 exceed the available area in the inline-progression direction by more than 50 points. (See position 30429:383)
[WARN] PropertyMaker - span="inherit" on fo:block, but no explicit value found on the parent FO.
The first is a debianism, the next two are possibly spurious [1]. But the next
two might be relevant?
I don't immediately see a way that's not too gross (like redefining HOME when
invoking fop) to set LOGLEVEL without editing .foprc. Perhaps we should add
advice to do so to docguide.sgml?
Greetings,
Andres Freund
[1] https://lists.apache.org/thread/yqkjzow3y8fpo9fc3hlbqb9fk49fonlf
^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: Make fop less verbose when building PDF
2023-03-24 19:47 Make fop less verbose when building PDF Andres Freund <[email protected]>
@ 2023-03-24 20:19 ` Tom Lane <[email protected]>
2023-03-24 21:02 ` Re: Make fop less verbose when building PDF Andres Freund <[email protected]>
0 siblings, 1 reply; 4+ messages in thread
From: Tom Lane @ 2023-03-24 20:19 UTC (permalink / raw)
To: Andres Freund <[email protected]>; +Cc: pgsql-hackers
Andres Freund <[email protected]> writes:
> I just figured out that one can hide those. Unfortunately not at the
> commandline, but in "$HOME/.foprc" or /etc.
> $ cat ~/.foprc
> LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=WARN
Yeah. I've done it locally by modifying the "fop" script ;-)
... but probably ~/.foprc would be neater. I see that I also
changed the default logger:
LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
because at least in the version I have, that isn't the default.
> [warning] /usr/bin/fop: JVM flavor 'sun' not understood
> [WARN] FOUserAgent - Font "Symbol,normal,700" not found. Substituting with "Symbol,normal,400".
> [WARN] FOUserAgent - Font "ZapfDingbats,normal,700" not found. Substituting with "ZapfDingbats,normal,400".
> [WARN] FOUserAgent - The contents of fo:block line 2 exceed the available area in the inline-progression direction by more than 50 points. (See position 30429:383)
> [WARN] PropertyMaker - span="inherit" on fo:block, but no explicit value found on the parent FO.
> The first is a debianism, the next two are possibly spurious [1]. But the next
> two might be relevant?
The one about "exceed the available area" has been on my radar to fix;
it's a consequence of an overly-wide example somebody added recently.
The other ones have been there all along and I don't know of a way to
get rid of them.
> I don't immediately see a way that's not too gross (like redefining HOME when
> invoking fop) to set LOGLEVEL without editing .foprc. Perhaps we should add
> advice to do so to docguide.sgml?
+1
regards, tom lane
^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: Make fop less verbose when building PDF
2023-03-24 19:47 Make fop less verbose when building PDF Andres Freund <[email protected]>
2023-03-24 20:19 ` Re: Make fop less verbose when building PDF Tom Lane <[email protected]>
@ 2023-03-24 21:02 ` Andres Freund <[email protected]>
0 siblings, 0 replies; 4+ messages in thread
From: Andres Freund @ 2023-03-24 21:02 UTC (permalink / raw)
To: Tom Lane <[email protected]>; +Cc: pgsql-hackers
Hi,
On 2023-03-24 16:19:57 -0400, Tom Lane wrote:
> Andres Freund <[email protected]> writes:
> > I just figured out that one can hide those. Unfortunately not at the
> > commandline, but in "$HOME/.foprc" or /etc.
>
> > $ cat ~/.foprc
> > LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=WARN
>
> Yeah. I've done it locally by modifying the "fop" script ;-)
> ... but probably ~/.foprc would be neater. I see that I also
> changed the default logger:
>
> LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
>
> because at least in the version I have, that isn't the default.
It might be a debian patch setting it as the default.
How about:
<para>
In its default configuration <productname>FOP</productname> will emit an
<literal>INFO</literal> message for each page. The log level can be
changed via <filename>~/.foprc</filename>:
<programlisting>
LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=WARN
</programlisting>
</para>
> > [warning] /usr/bin/fop: JVM flavor 'sun' not understood
> > [WARN] FOUserAgent - Font "Symbol,normal,700" not found. Substituting with "Symbol,normal,400".
> > [WARN] FOUserAgent - Font "ZapfDingbats,normal,700" not found. Substituting with "ZapfDingbats,normal,400".
> > [WARN] FOUserAgent - The contents of fo:block line 2 exceed the available area in the inline-progression direction by more than 50 points. (See position 30429:383)
> > [WARN] PropertyMaker - span="inherit" on fo:block, but no explicit value found on the parent FO.
>
> > The first is a debianism, the next two are possibly spurious [1]. But the next
> > two might be relevant?
>
> The one about "exceed the available area" has been on my radar to fix;
> it's a consequence of an overly-wide example somebody added recently.
Ah, good.
> The other ones have been there all along and I don't know of a way to
> get rid of them.
Yea, looks like the span="inherit" one is harmless and known:
https://issues.apache.org/jira/browse/FOP-1534
We could silence it in our stylesheet, but it's probably not worth bothering.
Greetings,
Andres Freund
^ permalink raw reply [nested|flat] 4+ messages in thread
end of thread, other threads:[~2023-03-24 21:02 UTC | newest]
Thread overview: 4+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2020-08-19 12:34 [PATCH 1/5] pg_rewind: Move syncTargetDirectory() to file_ops.c Heikki Linnakangas <[email protected]>
2023-03-24 19:47 Make fop less verbose when building PDF Andres Freund <[email protected]>
2023-03-24 20:19 ` Re: Make fop less verbose when building PDF Tom Lane <[email protected]>
2023-03-24 21:02 ` Re: Make fop less verbose when building PDF Andres Freund <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox