Fix layout xml and page layout caching issue on redis cluster under high load

[andrey-legayev]

Description (*)

Bugs which were fixed:

• $this->pageLayout was not checked after reading from cache, but was used as is
• two cache items were used in once place instead of one (performance impact)

Changes:

• replace 2 cache items by 1 - it should improve performance
• add "_MERGED" to cache key suffix to have compatibility with old cache keys during deployment of new version

Fixed Issues (if relevant)

1. Layout corruption with php-fpm (a Magento 1 problem returns) #6942 Layout corruption (Title is wrong, but issue is real)

Manual testing scenarios (*)

N/A

Contribution checklist (*)

• Pull request has a meaningful description of its purpose
• All commits are accompanied by meaningful commit messages
• All new or changed code is covered with unit/integration tests (if applicable)
• All automated tests passed successfully (all builds on Travis CI are green)

[m2-assistant]

Hi @andrey-legayev. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

• @magento-engcom-team give me test instance - deploy test instance based on PR changes
• @magento-engcom-team give me 2.3-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

[magento-cicd2]

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 10 committers have signed the CLA.

✅ sidolov
✅ magento-engcom-team
✅ shiftedreality
✅ StasKozar
❌ maiorange
❌ OlgaVasyltsun
❌ dhorytskyi
❌ rostyslav-hymon
❌ svitja
❌ viktym

[orlangur]

@andrey-legayev you need to create a new branch out of 2.3-develop, apply your changes on top with cherry-pick or something and then force push to layout-cache-fix-2.2.7.

[orlangur]

@andrey-legayev ow, this is a base branch for #22625 also and this cannot be changed. Please create a different base branch for 2.3.x PR.

[m2-assistant]

Hi @andrey-legayev, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

[m2-assistant]

Hi @andrey-legayev, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

[andrey-legayev]

no problem, I just couldn't fix it because of github outage...