diff --git a/CHANGELOG.md b/CHANGELOG.md index e69ed83..b9c36c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 3.0.8 2022-03-21 + + ### Added + - Add PARALLEL_COMPRESSION_THREADS environment variable to limit amount of threads when compressing - Currently autodetects however many processors are avaialable to the container + + ## 3.0.7 2022-03-21 ### Reverted diff --git a/README.md b/README.md index 5980c0a..4fc2327 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,7 @@ Be sure to view the following repositories to understand all the customizable op | `COMPRESSION` | Use either Gzip `GZ`, Bzip2 `BZ`, XZip `XZ`, ZSTD `ZSTD` or none `NONE` | `GZ` | | `COMPRESSION_LEVEL` | Numberical value of what level of compression to use, most allow `1` to `9` except for `ZSTD` which allows for `1` to `19` - | `3` | | `ENABLE_PARALLEL_COMPRESSION` | Use multiple cores when compressing backups `TRUE` or `FALSE` | `TRUE` | +| `PARALLEL_COMPRESSION_THREADS` | Maximum amount of threads to use when compressing - Integer value e.g. `8` | `autodetected` | | `ENABLE_CHECKSUM` | Generate either a MD5 or SHA1 in Directory, `TRUE` or `FALSE` | `TRUE` | | `CHECKSUM` | Either `MD5` or `SHA1` | `MD5` | | `EXTRA_OPTS` | If you need to pass extra arguments to the backup command, add them here e.g. `--extra-command` | | diff --git a/install/assets/defaults/10-db-backup b/install/assets/defaults/10-db-backup index 2037bee..91e5d69 100755 --- a/install/assets/defaults/10-db-backup +++ b/install/assets/defaults/10-db-backup @@ -14,6 +14,7 @@ MODE=${MODE:-"AUTO"} MYSQL_MAX_ALLOWED_PACKET=${MYSQL_MAX_ALLOWED_PACKET:-"512M"} MYSQL_SINGLE_TRANSACTION=${MYSQL_SINGLE_TRANSACTION:-"TRUE"} MYSQL_STORED_PROCEDURES=${MYSQL_STORED_PROCEDURES:-"TRUE"} +PARALLEL_COMPRESSION_THREADS=${PARALLEL_COMPRESSION_THREADS:-"$(nproc)"} S3_CERT_SKIP_VERIFY=${S3_CERT_SKIP_VERIFY:-"TRUE"} S3_PROTOCOL=${S3_PROTOCOL:-"https"} SIZE_VALUE=${SIZE_VALUE:-"bytes"} diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup index a8f6b24..3324889 100755 --- a/install/assets/functions/10-db-backup +++ b/install/assets/functions/10-db-backup @@ -3,10 +3,10 @@ bootstrap_compression() { ### Set Compression Options if var_true "${ENABLE_PARALLEL_COMPRESSION}" ; then - bzip="pbzip2 -${COMPRESSION_LEVEL}" - gzip="pigz -${COMPRESSION_LEVEL}" - xzip="pixz -${COMPRESSION_LEVEL}" - zstd="zstd --rm -${COMPRESSION_LEVEL}" + bzip="pbzip2 -${COMPRESSION_LEVEL} -p${PARALLEL_COMPRESSION_THREADS}" + gzip="pigz -${COMPRESSION_LEVEL} -p ${PARALLEL_COMPRESSION_THREADS}" + xzip="pixz -${COMPRESSION_LEVEL} -p ${PARALLEL_COMPRESSION_THREADS}" + zstd="zstd --rm -${COMPRESSION_LEVEL} -T${PARALLEL_COMPRESSION_THREADS}" else bzip="bzip2 -${COMPRESSION_LEVEL}" gzip="gzip -${COMPRESSION_LEVEL}"