Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WEB_CONCURRENCY auto-tuning: PHP memory_limit improvements, streamlined output, verbose mode #684

Merged
merged 8 commits into from
Jan 31, 2024
Merged

WEB_CONCURRENCY auto-tuning: PHP memory_limit improvements, streamlined output, verbose mode #684

merged 8 commits into from
Jan 31, 2024

Commits on Jan 25, 2024

  1. handle invalid memory_limit suffix

    @dzuelke
    dzuelke committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    3d67436 View commit details
    Browse the repository at this point in the history

  2. fix null deprecation warning if fpm config missing in autotune.php

    @dzuelke
    dzuelke committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    d9a3f5d View commit details
    Browse the repository at this point in the history

  3. make RAM_LIMIT arg optional in autotune.php

    @dzuelke
    dzuelke committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    cecfe2a View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Human-readable RAM limit output

    @dzuelke
    dzuelke committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    e676235 View commit details
    Browse the repository at this point in the history

  2. refactor -t option handling ahead of related changes 

    We need to dump the FPM config for WEB_CONCURRENCY calculation, and so we can re-use a bunch of the logic and make the code a bit neater
    @dzuelke
    dzuelke committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    e640a6e View commit details
    Browse the repository at this point in the history

  3. Improve memory_limit detection 

    Turns out that bug which would not allow overriding of FPM config php_value settings in .user.ini was fixed in... PHP 7.2: https://bugs.php.net/bug.php?id=75212

Also, that behavior where a later declaration does not override a newer one is probably a bug: php/php-src#13249

We now use php-fpm -tt to dump the config, since that will have stuff printed in evaluation order - if the bug above ever gets fixed, we have to do nothing.

This also removes the need for us to handle the PHP-FPM config include directives ourselves, and as a result, variable expansion and globbing now work in these!

GUS-W-14901875
    @dzuelke
    dzuelke committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    deb4e72 View commit details
    Browse the repository at this point in the history

  4. Streamline WEB_CONCURRENCY related output 

    It is now all handled by autotune.php, and available RAM is in human readable format.

The removal of the read command also makes errors from autotune.php bubble up.

GUS-W-14901894
    @dzuelke
    dzuelke committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    2d96005 View commit details
    Browse the repository at this point in the history

  5. verbose mode for autotune.php and RAM detection 

    GUS-W-14901894
    @dzuelke
    dzuelke committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    3866053 View commit details
    Browse the repository at this point in the history