try less mem for geesefs

This commit is contained in:
Max K 2024-08-01 18:46:09 +02:00
parent a6d0b7afbb
commit 30e0c1a1b8
2 changed files with 16 additions and 13 deletions

View File

@ -17,7 +17,7 @@ concurrency:
- patch
- new
only-repo:
description: 'Run only repos updates including docker (recovery)'
description: 'Run only repos updates including docker (repo-recovery, tests)'
required: false
default: false
type: boolean
@ -68,10 +68,11 @@ jobs:
shell: bash
run: |
python3 ./tests/ci/create_release.py --push-new-release-branch ${{ inputs.dry-run == true && '--dry-run' || '' }}
# - name: Bump CH Version and Update Contributors' List
# shell: bash
# run: |
# python3 ./tests/ci/create_release.py --create-bump-version-pr ${{ inputs.dry-run == true && '--dry-run' || '' }}
- name: Bump CH Version and Update Contributors' List
if: ${{ ! inputs.only-repo }}
shell: bash
run: |
python3 ./tests/ci/create_release.py --create-bump-version-pr ${{ inputs.dry-run == true && '--dry-run' || '' }}
- name: Bump Docker versions, Changelog, Security
if: ${{ inputs.type == 'patch' && ! inputs.only-repo }}
shell: bash
@ -117,11 +118,11 @@ jobs:
python3 ./tests/ci/create_release.py --set-progress-completed
git reset --hard HEAD
git checkout "$GITHUB_REF_NAME"
# - name: Create GH Release
# shell: bash
# if: ${{ inputs.type == 'patch' }}
# run: |
# python3 ./tests/ci/create_release.py --create-gh-release ${{ inputs.dry-run == true && '--dry-run' || '' }}
- name: Create GH Release
if: ${{ inputs.type == 'patch' && ! inputs.only-repo }}
shell: bash
run: |
python3 ./tests/ci/create_release.py --create-gh-release ${{ inputs.dry-run == true && '--dry-run' || '' }}
- name: Export TGZ Packages
if: ${{ inputs.type == 'patch' }}
shell: bash

View File

@ -67,8 +67,8 @@ class R2MountPoint:
f" --shared-config=/home/ubuntu/.r2_auth_test "
)
if self.DEBUG:
self.aux_mount_options += " --debug_s3 --debug_fuse "
self.mount_cmd = f"geesefs --endpoint={self.API_ENDPOINT} --cheap --memory-limit=2050 --gc-interval=100 --max-flushers=5 --max-parallel-parts=1 --max-parallel-copy=2 --log-file={self.LOG_FILE} {self.aux_mount_options} {self.bucket_name} {self.MOUNT_POINT}"
self.aux_mount_options += " --debug_s3 "
self.mount_cmd = f"geesefs --endpoint={self.API_ENDPOINT} --cheap --memory-limit=1000 --gc-interval=100 --max-flushers=10 --max-parallel-parts=1 --max-parallel-copy=10 --log-file={self.LOG_FILE} {self.aux_mount_options} {self.bucket_name} {self.MOUNT_POINT}"
else:
assert False
@ -207,8 +207,10 @@ class RpmArtifactory:
for package in paths:
_copy_if_not_exists(Path(package), dest_dir)
# switching between different fuse providers invalidates --update option (apparently some fuse(s) can mess around with mtime)
# add --skip-stat to skip mtime check
commands = (
f"createrepo_c --local-sqlite --workers=2 --update --verbose {dest_dir}",
f"createrepo_c --local-sqlite --workers=2 --update --skip-stat --verbose {dest_dir}",
f"gpg --sign-with {self._SIGN_KEY} --detach-sign --batch --yes --armor {dest_dir / 'repodata' / 'repomd.xml'}",
)
print(f"Exporting RPM packages into [{codename}]")