Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## v3 #5220 +/- ##
==========================================
+ Coverage 41.49% 42.11% +0.61%
==========================================
Files 410 410
Lines 41992 41990 -2
==========================================
+ Hits 17424 17682 +258
+ Misses 22814 22523 -291
- Partials 1754 1785 +31
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
807aa15 to
2d272fa
Compare
| echo "NSS wrapper enabled with $NSS_WRAPPER_LIB" | ||
| fi | ||
|
|
||
| # Check /usr/share/pmm-server directory on every start |
There was a problem hiding this comment.
This section was preceding "/srv" initialization below, which is wrong timing. Moved below it.
| } | ||
|
|
||
| http { | ||
| # Configure temporary directories to use /usr/share/pmm-server/nginx |
There was a problem hiding this comment.
This moves Nginx temp directories to a mutable storage, which is where it should be.
| - clickhouse | ||
| - nginx | ||
|
|
||
| - name: Clean Clickhouse dir |
There was a problem hiding this comment.
The removals in this play are no longer necessary, since we clean up the whole "/srv" down below.
| - hosts: all | ||
| become: yes | ||
| gather_facts: yes | ||
| vars: |
| owner: pmm | ||
| group: root | ||
|
|
||
| - name: Remove pmm-managed database from PostgreSQL |
There was a problem hiding this comment.
This whole set of tasks is now redundant since we wipe out the whole "/srv" directory, where the DB is stored.
|
@pmm-bot build all |
|
Server docker: |
PMM-14934
Link to the Feature Build: SUBMODULES-4295
This pull request introduces significant changes to how temporary and initialization directories are managed in the Docker build and runtime for PMM, especially for Nginx and
/srv. It standardizes temp directory locations, simplifies initialization logic, and cleans up legacy and redundant steps in the Ansible and entrypoint scripts.Directory and Temp File Management Improvements:
/srv/nginx/tmpinstead of/usr/share/pmm-server/nginx, and all related configuration and Ansible tasks have been updated accordingly. (build/ansible/roles/nginx/files/nginx.conf,build/ansible/roles/nginx/tasks/main.yml,build/docker/server/entrypoint.sh[1] [2] [3] [4]/srvdirectory is now cleaned and re-initialized more robustly during the build, removing legacy cleanup logic and ensuring a fresh state on container start. (build/ansible/pmm-docker/post-build.yml[1] [2] [3] [4] [5]Entrypoint and Initialization Logic:
/usr/share/pmm-serverand instead ensures/srv/nginx/tmpexists, aligning with the new standard. It also improves/srvinitialization and temp directory creation forpmm-agent. (build/docker/server/entrypoint.sh[1] [2]Code Simplification and Cleanup:
build/ansible/pmm-docker/post-build.yml[1] [2] [3] [4] [5]wg.Gofor running a goroutine, improving code clarity. (managed/cmd/pmm-managed/main.gomanaged/cmd/pmm-managed/main.goL1120-R1122)