Changeset 542 for trunk

Timestamp:

12/15/2011 16:37:53 (5 months ago)

Author:

blee

Message:

Add new option CONF_EXPORT_INCREMENTAL_LN to allow incremental confexports
to use ln(1) rather than cp(1). This only works when temporary files and
CONF_EXPORT_FILE are on the same filesystem partition.

See #140

Location:

trunk

Files:

• confman.conf.5.in (modified) (1 diff)
• confman.conf.in (modified) (1 diff)
• confmanlib.sh.in (modified) (2 diffs)

trunk/confman.conf.5.in

@@ -114 +114 @@
 .Xr confexport 8 run.  This option has no effect when using repository-style
 exports.
+.It CONF_EXPORT_INCREMENTAL_LN
+This option further optimizes
+.Xr confexport 8 performance when using CONF_EXPORT_INCREMENTAL.  When enabled,
+.Xr confexport 8 will use
+.Xr ln 1 to copy unchanged exports into the new export rather than
+.Xr cp 1 .  This option can only be used if temporary files are created
+on the same filesystem partition as CONF_EXPORT_FILE.
 .It CONF_FETCH_SSH_KEY
 This is a private SSH keyfile for use with "sftp://" and "scp://" URIs above.

trunk/confman.conf.in

@@ -81 +81 @@
 CONF_EXPORT_STYLE="repository"
 CONF_EXPORT_INCREMENTAL="false"
+CONF_EXPORT_INCREMENTAL_LN="false"
 EXPORT_REPO_PROTOCOL=""
 EXPORT_REPO_HOSTNAME=""

trunk/confmanlib.sh.in

@@ -437 +437 @@
                     # This module was not changed, so preserve its old export
                     echo "Preserving old export for module: ${module}"
-                    cp -p "${CONF_EXPORT_FILE}/${module}.tgz" "${exportpath}" || return 1
+                    if ${CONF_EXPORT_INCREMENTAL_LN}; then
+                        ln "${CONF_EXPORT_FILE}/${module}.tgz" "${exportpath}" || return 1
+                    else
+                        cp -p "${CONF_EXPORT_FILE}/${module}.tgz" "${exportpath}" || return 1
+                    fi
                 done
 
@@ -491 +495 @@
                     # changed module, so preserve its old export
                     echo "Preserving old export for recipe: ${recipe}"
-                    cp -p "${CONF_EXPORT_FILE}/${recipe}.tgz" "${exportpath}" || return 1
+                    if ${CONF_EXPORT_INCREMENTAL_LN}; then
+                        ln "${CONF_EXPORT_FILE}/${recipe}.tgz" "${exportpath}" || return 1
+                    else
+                        cp -p "${CONF_EXPORT_FILE}/${recipe}.tgz" "${exportpath}" || return 1
+                    fi
                 done
                 conf_debug "updated_recipes: ${updated_recipes}"