MC-39521: Random deadlocks during setting email sent flag

[engcom-Golf]

Removed extra save sales entity that causes load on database

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

1. Fixes Random deadlocks during setting email sent flag #31090

Manual testing scenarios (*)

Use following scenario to test order, invoice, shipment and credit memo creation

1. Configure email sending
2. Enable async email send in Stores->Configuration->Sales->Sales Emal
3. Create Order on FE
4. Perform PHP bin/magento cron:run command

Expected result:

Email sent and sales entity has set flag email_sent & send_email in database
Email is not sent a second time if cron:run is performed again

Questions or comments

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 are green)

[m2-assistant]

Hi @engcom-Golf. 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 give me test instance - deploy test instance based on PR changes
• @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

• @magento run all tests - run or re-run all required tests against the PR changes
• @magento run <test-build(s)> - run or re-run specific test build(s)
  For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

1. Database Compare
2. Functional Tests CE
3. Functional Tests EE,
4. Functional Tests B2B
5. Integration Tests
6. Magento Health Index
7. Sample Data Tests CE
8. Sample Data Tests EE
9. Sample Data Tests B2B
10. Static Tests
11. Unit Tests
12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

[engcom-Golf]

@magento run all tests

[ihor-sviziev]

In general looks good. Let's wait for test results

[ihor-sviziev]

@magento run Functional Tests B2B

[ihor-sviziev]

✔ Approved.

Failing tests looks not related to changes form this PR.

[magento-engcom-team]

Hi @ihor-sviziev, thank you for the review.
ENGCOM-8528 has been created to process this Pull Request

[zakdma]

@magento import code to https://github.com/magento-tsg/magento2ce

[magento-engcom-team]

@zakdma, an error occurred during the Pull Request import.

[magento-engcom-team]

@zakdma, an error occurred during the Pull Request import.

[zakdma]

@magento import code to https://github.com/magento-tsg/magento2ce

[magento-engcom-team]

@zakdma, an error occurred during the Pull Request import.

[magento-engcom-team]

@zakdma, an error occurred during the Pull Request import.

[zakdma]

@magento import code to https://github.com/magento-tsg/magento2ce

[magento-engcom-team]

@zakdma the branch with code successfully imported intomagento-tsg/magento2ce repository. Branch name: imported-magento-magento2-31189.

[engcom-Bravo]

✔️ QA Passed

Manual testing scenarios

Use the following scenario to test order, invoice, shipment and credit memo creation

1. Configure email sending
2. Enable async email send in Stores->Configuration->Sales->Sales Email
3. Create Order on FE
4. Perform PHP bin/magento cron:run command

Actual Result:
Email sent and sales entity has set flag email_sent & send_email in database
Email is not sent a second time if cron:run is performed again

Before cron:run

After cron:run

Also, before applying the changes provided in the PR, debug stopped on 1st and 2nd breakpoints after bin/magento cron:run

magento2/app/code/Magento/Sales/Model/EmailSenderHandler.php

Line 111 in d7ab99d

if ($this->emailSender->send($item, true)) {

and

magento2/app/code/Magento/Sales/Model/ResourceModel/Order/Relation.php

Line 69 in d7ab99d

if (null !== $object->getItems()) {

After switching to the PR, debug stops only once

[m2-assistant]

Hi @engcom-Golf, 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.