Introduce file_copy_method setting.

It can be set to either COPY (the default) or CLONE if the system
supports it.  CLONE causes callers of copydir(), currently CREATE
DATABASE ... STRATEGY=FILE_COPY and ALTER DATABASE ... SET TABLESPACE =
..., to use copy_file_range (Linux, FreeBSD) or copyfile (macOS) to copy
files instead of a read-write loop over the contents.

CLONE gives the kernel the opportunity to share block ranges on
copy-on-write file systems and push copying down to storage on others,
depending on configuration.  On some systems CLONE can be used to clone
large databases quickly with CREATE DATABASE ... TEMPLATE=source
STRATEGY=FILE_COPY.

Other operating systems could be supported; patches welcome.

Co-authored-by: Nazir Bilal Yavuz 
Reviewed-by: Robert Haas 
Reviewed-by: Ranier Vilela 
Discussion: https://postgr.es/m/CA%2BhUKGLM%2Bt%2BSwBU-cHeMUXJCOgBxSHLGZutV5zCwY4qrCcE02w%40mail.gmail.com

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index a8542fe41cecad974774e5bf0028a8212c5c992f..c1674c22cb21bca68d87944152f6f99d92d86f2c 100644 (file)
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -2347,6 +2347,44 @@ include_dir 'conf.d'
       
      
 
+     
+      file_copy_method (enum)
+      
+       file_copy_method configuration parameter
+      
+      
+      
+       
+        Specifies the method used to copy files.
+        Possible values are COPY (default) and
+        CLONE (if operating support is available).
+       
+
+       
+       This parameter affects:
+       
+       
+        
+        
+         CREATE DATABASE ... STRATEGY=FILE_COPY
+        
+        
+        
+        
+         ALTER DATABASE ... SET TABLESPACE ...
+        
+        
+       
+
+       
+        CLONE uses the copy_file_range()
+        (Linux, FreeBSD) or copyfile
+        (macOS) system calls, giving the kernel the opportunity to share disk
+        blocks or push work down to lower layers on some file systems.
+       
+      
+     
+
      
       max_notify_queue_pages (integer)
       

diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml
index 2479c41e8d6350bdc3b88e35c68f2067a82b2199..835c1af87eb53faff0c00fc0685d357817decddc 100644 (file)
--- a/doc/src/sgml/ref/alter_database.sgml
+++ b/doc/src/sgml/ref/alter_database.sgml
@@ -82,7 +82,8 @@ ALTER DATABASE name RESET ALL
    default tablespace to the new tablespace.  The new default tablespace
    must be empty for this database, and no one can be connected to
    the database.  Tables and indexes in non-default tablespaces are
-   unaffected.
+   unaffected.  The method used to copy files to the new tablespace
+   is affected by the  setting.
   
 
   

diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index a4b052ba08b773388eb45d9b189681e1a9f4f9bb..640c0425faec521083aad8c6885ad9b457695bda 100644 (file)
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -138,7 +138,9 @@ CREATE DATABASE name
         log volume substantially, especially if the template database is large,
         it also forces the system to perform a checkpoint both before and
         after the creation of the new database. In some situations, this may
-        have a noticeable negative impact on overall system performance.
+        have a noticeable negative impact on overall system performance. The
+        FILE_COPY strategy is affected by the 
+        linkend="guc_file_copy_method"/> setting.
        
       
      


diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c

index c335b60a367901f54e7b5aa7bdc2ac19f66a3df6..aa8c64a2c9eb5ff54a78e787db2713276eb08800 100644 (file)

--- a/src/backend/storage/file/copydir.c
+++ b/src/backend/storage/file/copydir.c
@@ -18,6 +18,9 @@
 
 #include "postgres.h"
 
+#ifdef HAVE_COPYFILE_H
+#include 
+#endif
 #include 
 #include 
 
@@ -27,11 +30,19 @@
 #include "storage/copydir.h"
 #include "storage/fd.h"
 
+/* GUCs */
+int            file_copy_method = FILE_COPY_METHOD_COPY;
+
+static void clone_file(const char *fromfile, const char *tofile);
+
 /*
  * copydir: copy a directory
  *
  * If recurse is false, subdirectories are ignored.  Anything that's not
  * a directory or a regular file is ignored.
+ *
+ * This function uses the file_copy_method GUC.  New uses of this function must
+ * be documented in doc/src/sgml/config.sgml.
  */
 void
 copydir(const char *fromdir, const char *todir, bool recurse)
@@ -71,7 +82,12 @@ copydir(const char *fromdir, const char *todir, bool recurse)
                copydir(fromfile, tofile, true);
        }
        else if (xlde_type == PGFILETYPE_REG)
-           copy_file(fromfile, tofile);
+       {
+           if (file_copy_method == FILE_COPY_METHOD_CLONE)
+               clone_file(fromfile, tofile);
+           else
+               copy_file(fromfile, tofile);
+       }
    }
    FreeDir(xldir);
 
@@ -214,3 +230,65 @@ copy_file(const char *fromfile, const char *tofile)
 
    pfree(buffer);
 }
+
+/*
+ * clone one file
+ */
+static void
+clone_file(const char *fromfile, const char *tofile)
+{
+#if defined(HAVE_COPYFILE) && defined(COPYFILE_CLONE_FORCE)
+   if (copyfile(fromfile, tofile, NULL, COPYFILE_CLONE_FORCE) < 0)
+       ereport(ERROR,
+               (errcode_for_file_access(),
+                errmsg("could not clone file \"%s\" to \"%s\": %m",
+                       fromfile, tofile)));
+#elif defined(HAVE_COPY_FILE_RANGE)
+   int         srcfd;
+   int         dstfd;
+   ssize_t     nbytes;
+
+   srcfd = OpenTransientFile(fromfile, O_RDONLY | PG_BINARY);
+   if (srcfd < 0)
+       ereport(ERROR,
+               (errcode_for_file_access(),
+                errmsg("could not open file \"%s\": %m", fromfile)));
+
+   dstfd = OpenTransientFile(tofile, O_WRONLY | O_CREAT | O_EXCL | PG_BINARY);
+   if (dstfd < 0)
+       ereport(ERROR,
+               (errcode_for_file_access(),
+                errmsg("could not create file \"%s\": %m", tofile)));
+
+   do
+   {
+       /*
+        * Don't copy too much at once, so we can check for interrupts from
+        * time to time if it falls back to a slow copy.
+        */
+       CHECK_FOR_INTERRUPTS();
+       pgstat_report_wait_start(WAIT_EVENT_COPY_FILE_COPY);
+       nbytes = copy_file_range(srcfd, NULL, dstfd, NULL, 1024 * 1024, 0);
+       if (nbytes < 0 && errno != EINTR)
+           ereport(ERROR,
+                   (errcode_for_file_access(),
+                    errmsg("could not clone file \"%s\" to \"%s\": %m",
+                           fromfile, tofile)));
+       pgstat_report_wait_end();
+   }
+   while (nbytes != 0);
+
+   if (CloseTransientFile(dstfd) != 0)
+       ereport(ERROR,
+               (errcode_for_file_access(),
+                errmsg("could not close file \"%s\": %m", tofile)));
+
+   if (CloseTransientFile(srcfd) != 0)
+       ereport(ERROR,
+               (errcode_for_file_access(),
+                errmsg("could not close file \"%s\": %m", fromfile)));
+#else
+   /* If there is no CLONE support this function should not be called. */
+   pg_unreachable();
+#endif
+}


diff --git a/src/backend/utils/activity/wait_event_names.txt b/src/backend/utils/activity/wait_event_names.txt

index 23eaf559c8dce50271d78f8ea582064e6dc29903..930321905f18c27ed01e498718ef8fcb81ce2d19 100644 (file)

--- a/src/backend/utils/activity/wait_event_names.txt
+++ b/src/backend/utils/activity/wait_event_names.txt
@@ -208,6 +208,7 @@ CONTROL_FILE_SYNC   "Waiting for the pg_control file to reach
 CONTROL_FILE_SYNC_UPDATE   "Waiting for an update to the pg_control file to reach durable storage."
 CONTROL_FILE_WRITE "Waiting for a write to the pg_control file."
 CONTROL_FILE_WRITE_UPDATE  "Waiting for a write to update the pg_control file."
+COPY_FILE_COPY "Waiting for a file copy operation."
 COPY_FILE_READ "Waiting for a read during a file copy operation."
 COPY_FILE_WRITE    "Waiting for a write during a file copy operation."
 DATA_FILE_EXTEND   "Waiting for a relation data file to be extended."


diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c

index d54df555fba9147f210f2da07ec50f56d2c3f97b..60b12446a1c98e252e090d291070b872c7695b84 100644 (file)

--- a/src/backend/utils/misc/guc_tables.c
+++ b/src/backend/utils/misc/guc_tables.c
@@ -20,6 +20,9 @@
  */
 #include "postgres.h"
 
+#ifdef HAVE_COPYFILE_H
+#include 
+#endif
 #include 
 #include 
 #ifdef HAVE_SYSLOG
@@ -76,6 +79,7 @@
 #include "storage/aio.h"
 #include "storage/bufmgr.h"
 #include "storage/bufpage.h"
+#include "storage/copydir.h"
 #include "storage/io_worker.h"
 #include "storage/large_object.h"
 #include "storage/pg_shmem.h"
@@ -479,6 +483,14 @@ static const struct config_enum_entry wal_compression_options[] = {
    {NULL, 0, false}
 };
 
+static const struct config_enum_entry file_copy_method_options[] = {
+   {"copy", FILE_COPY_METHOD_COPY, false},
+#if defined(HAVE_COPYFILE) && defined(COPYFILE_CLONE_FORCE) || defined(HAVE_COPY_FILE_RANGE)
+   {"clone", FILE_COPY_METHOD_CLONE, false},
+#endif
+   {NULL, 0, false}
+};
+
 /*
  * Options for enum values stored in other modules
  */
@@ -5242,6 +5254,16 @@ struct config_enum ConfigureNamesEnum[] =
        NULL, NULL, NULL
    },
 
+   {
+       {"file_copy_method", PGC_USERSET, RESOURCES_DISK,
+           gettext_noop("Selects the file copy method."),
+           NULL
+       },
+       &file_copy_method,
+       FILE_COPY_METHOD_COPY, file_copy_method_options,
+       NULL, NULL, NULL
+   },
+
    {
        {"wal_sync_method", PGC_SIGHUP, WAL_SETTINGS,
            gettext_noop("Selects the method used for forcing WAL updates to disk."),


diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample

index 25fe90a430f4f84b430cc3ba4e3198ad9c174f7f..34826d01380b70b1c6fe5c2c06e26535634348e9 100644 (file)

--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -183,6 +183,10 @@
 #max_notify_queue_pages = 1048576  # limits the number of SLRU pages allocated
                    # for NOTIFY / LISTEN queue
 
+#file_copy_method = copy   # the default is the first option
+                   #   copy
+                   #   clone (if system support is available)
+
 # - Kernel Resources -
 
 #max_files_per_process = 1000      # min 64


diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h

index cf60e63f4e2d7f5301382c3022d40b20c76973c6..940d74462d129c0f1c6067ff26b45f9822d773c9 100644 (file)

--- a/src/include/storage/copydir.h
+++ b/src/include/storage/copydir.h
@@ -13,6 +13,15 @@
 #ifndef COPYDIR_H
 #define COPYDIR_H
 
+typedef enum FileCopyMethod
+{
+   FILE_COPY_METHOD_COPY,
+   FILE_COPY_METHOD_CLONE,
+} FileCopyMethod;
+
+/* GUC parameters */
+extern PGDLLIMPORT int file_copy_method;
+
 extern void copydir(const char *fromdir, const char *todir, bool recurse);
 extern void copy_file(const char *fromfile, const char *tofile);
 


diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list

index 780e4c4fc07cd61315a1a4f5b00604a3bb790ff5..d16bc208654b1187b3348de20611da3724768d8a 100644 (file)

--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -804,6 +804,7 @@ FieldSelect
 FieldStore
 File
 FileBackupMethod
+FileCopyMethod
 FileFdwExecutionState
 FileFdwPlanState
 FileNameMap

diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c
index c335b60a367901f54e7b5aa7bdc2ac19f66a3df6..aa8c64a2c9eb5ff54a78e787db2713276eb08800 100644 (file)
--- a/src/backend/storage/file/copydir.c
+++ b/src/backend/storage/file/copydir.c
@@ -18,6 +18,9 @@
 
 #include "postgres.h"
 
+#ifdef HAVE_COPYFILE_H
+#include 
+#endif
 #include 
 #include 
 
@@ -27,11 +30,19 @@
 #include "storage/copydir.h"
 #include "storage/fd.h"
 
+/* GUCs */
+int            file_copy_method = FILE_COPY_METHOD_COPY;
+
+static void clone_file(const char *fromfile, const char *tofile);
+
 /*
  * copydir: copy a directory
  *
  * If recurse is false, subdirectories are ignored.  Anything that's not
  * a directory or a regular file is ignored.
+ *
+ * This function uses the file_copy_method GUC.  New uses of this function must
+ * be documented in doc/src/sgml/config.sgml.
  */
 void
 copydir(const char *fromdir, const char *todir, bool recurse)
@@ -71,7 +82,12 @@ copydir(const char *fromdir, const char *todir, bool recurse)
                copydir(fromfile, tofile, true);
        }
        else if (xlde_type == PGFILETYPE_REG)
-           copy_file(fromfile, tofile);
+       {
+           if (file_copy_method == FILE_COPY_METHOD_CLONE)
+               clone_file(fromfile, tofile);
+           else
+               copy_file(fromfile, tofile);
+       }
    }
    FreeDir(xldir);
 
@@ -214,3 +230,65 @@ copy_file(const char *fromfile, const char *tofile)
 
    pfree(buffer);
 }
+
+/*
+ * clone one file
+ */
+static void
+clone_file(const char *fromfile, const char *tofile)
+{
+#if defined(HAVE_COPYFILE) && defined(COPYFILE_CLONE_FORCE)
+   if (copyfile(fromfile, tofile, NULL, COPYFILE_CLONE_FORCE) < 0)
+       ereport(ERROR,
+               (errcode_for_file_access(),
+                errmsg("could not clone file \"%s\" to \"%s\": %m",
+                       fromfile, tofile)));
+#elif defined(HAVE_COPY_FILE_RANGE)
+   int         srcfd;
+   int         dstfd;
+   ssize_t     nbytes;
+
+   srcfd = OpenTransientFile(fromfile, O_RDONLY | PG_BINARY);
+   if (srcfd < 0)
+       ereport(ERROR,
+               (errcode_for_file_access(),
+                errmsg("could not open file \"%s\": %m", fromfile)));
+
+   dstfd = OpenTransientFile(tofile, O_WRONLY | O_CREAT | O_EXCL | PG_BINARY);
+   if (dstfd < 0)
+       ereport(ERROR,
+               (errcode_for_file_access(),
+                errmsg("could not create file \"%s\": %m", tofile)));
+
+   do
+   {
+       /*
+        * Don't copy too much at once, so we can check for interrupts from
+        * time to time if it falls back to a slow copy.
+        */
+       CHECK_FOR_INTERRUPTS();
+       pgstat_report_wait_start(WAIT_EVENT_COPY_FILE_COPY);
+       nbytes = copy_file_range(srcfd, NULL, dstfd, NULL, 1024 * 1024, 0);
+       if (nbytes < 0 && errno != EINTR)
+           ereport(ERROR,
+                   (errcode_for_file_access(),
+                    errmsg("could not clone file \"%s\" to \"%s\": %m",
+                           fromfile, tofile)));
+       pgstat_report_wait_end();
+   }
+   while (nbytes != 0);
+
+   if (CloseTransientFile(dstfd) != 0)
+       ereport(ERROR,
+               (errcode_for_file_access(),
+                errmsg("could not close file \"%s\": %m", tofile)));
+
+   if (CloseTransientFile(srcfd) != 0)
+       ereport(ERROR,
+               (errcode_for_file_access(),
+                errmsg("could not close file \"%s\": %m", fromfile)));
+#else
+   /* If there is no CLONE support this function should not be called. */
+   pg_unreachable();
+#endif
+}

diff --git a/src/backend/utils/activity/wait_event_names.txt b/src/backend/utils/activity/wait_event_names.txt
index 23eaf559c8dce50271d78f8ea582064e6dc29903..930321905f18c27ed01e498718ef8fcb81ce2d19 100644 (file)
--- a/src/backend/utils/activity/wait_event_names.txt
+++ b/src/backend/utils/activity/wait_event_names.txt
@@ -208,6 +208,7 @@ CONTROL_FILE_SYNC   "Waiting for the pg_control file to reach
 CONTROL_FILE_SYNC_UPDATE   "Waiting for an update to the pg_control file to reach durable storage."
 CONTROL_FILE_WRITE "Waiting for a write to the pg_control file."
 CONTROL_FILE_WRITE_UPDATE  "Waiting for a write to update the pg_control file."
+COPY_FILE_COPY "Waiting for a file copy operation."
 COPY_FILE_READ "Waiting for a read during a file copy operation."
 COPY_FILE_WRITE    "Waiting for a write during a file copy operation."
 DATA_FILE_EXTEND   "Waiting for a relation data file to be extended."

diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c
index d54df555fba9147f210f2da07ec50f56d2c3f97b..60b12446a1c98e252e090d291070b872c7695b84 100644 (file)
--- a/src/backend/utils/misc/guc_tables.c
+++ b/src/backend/utils/misc/guc_tables.c
@@ -20,6 +20,9 @@
  */
 #include "postgres.h"
 
+#ifdef HAVE_COPYFILE_H
+#include 
+#endif
 #include 
 #include 
 #ifdef HAVE_SYSLOG
@@ -76,6 +79,7 @@
 #include "storage/aio.h"
 #include "storage/bufmgr.h"
 #include "storage/bufpage.h"
+#include "storage/copydir.h"
 #include "storage/io_worker.h"
 #include "storage/large_object.h"
 #include "storage/pg_shmem.h"
@@ -479,6 +483,14 @@ static const struct config_enum_entry wal_compression_options[] = {
    {NULL, 0, false}
 };
 
+static const struct config_enum_entry file_copy_method_options[] = {
+   {"copy", FILE_COPY_METHOD_COPY, false},
+#if defined(HAVE_COPYFILE) && defined(COPYFILE_CLONE_FORCE) || defined(HAVE_COPY_FILE_RANGE)
+   {"clone", FILE_COPY_METHOD_CLONE, false},
+#endif
+   {NULL, 0, false}
+};
+
 /*
  * Options for enum values stored in other modules
  */
@@ -5242,6 +5254,16 @@ struct config_enum ConfigureNamesEnum[] =
        NULL, NULL, NULL
    },
 
+   {
+       {"file_copy_method", PGC_USERSET, RESOURCES_DISK,
+           gettext_noop("Selects the file copy method."),
+           NULL
+       },
+       &file_copy_method,
+       FILE_COPY_METHOD_COPY, file_copy_method_options,
+       NULL, NULL, NULL
+   },
+
    {
        {"wal_sync_method", PGC_SIGHUP, WAL_SETTINGS,
            gettext_noop("Selects the method used for forcing WAL updates to disk."),

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 25fe90a430f4f84b430cc3ba4e3198ad9c174f7f..34826d01380b70b1c6fe5c2c06e26535634348e9 100644 (file)
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -183,6 +183,10 @@
 #max_notify_queue_pages = 1048576  # limits the number of SLRU pages allocated
                    # for NOTIFY / LISTEN queue
 
+#file_copy_method = copy   # the default is the first option
+                   #   copy
+                   #   clone (if system support is available)
+
 # - Kernel Resources -
 
 #max_files_per_process = 1000      # min 64

diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
index cf60e63f4e2d7f5301382c3022d40b20c76973c6..940d74462d129c0f1c6067ff26b45f9822d773c9 100644 (file)
--- a/src/include/storage/copydir.h
+++ b/src/include/storage/copydir.h
@@ -13,6 +13,15 @@
 #ifndef COPYDIR_H
 #define COPYDIR_H
 
+typedef enum FileCopyMethod
+{
+   FILE_COPY_METHOD_COPY,
+   FILE_COPY_METHOD_CLONE,
+} FileCopyMethod;
+
+/* GUC parameters */
+extern PGDLLIMPORT int file_copy_method;
+
 extern void copydir(const char *fromdir, const char *todir, bool recurse);
 extern void copy_file(const char *fromfile, const char *tofile);
 

diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index 780e4c4fc07cd61315a1a4f5b00604a3bb790ff5..d16bc208654b1187b3348de20611da3724768d8a 100644 (file)
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -804,6 +804,7 @@ FieldSelect
 FieldStore
 File
 FileBackupMethod
+FileCopyMethod
 FileFdwExecutionState
 FileFdwPlanState
 FileNameMap