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.

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

MC-39718: Process Manager always exits successfully #31368

Merged
merged 1 commit into from
Dec 26, 2020

Conversation

engcom-Golf
Copy link
Contributor

if the amount of functions(i.e. indexer dimensions) is lower than the MAGE_INDEXER_THREADS_COUNT env variable

Description (*)

Added logic to check if child process has exit code >0 then mark parent process as failed

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes Process Manager always exits successfully if the amount of functions(i.e. indexer dimensions) is lower than the MAGE_INDEXER_THREADS_COUNT env variable #30964

Manual testing scenarios (*)

  1. Configure a second website with store and store view
  2. Generate a small profile for performance testing
  3. Run fulltext_search reindex with parameter MAGE_INDEXER_THREADS_COUNT > {stores count}
  4. While reindex is not finished disable elasticsearch in a separate terminal window

Expected result:

The message "reindex successfully finished" is not shown
Reindex is not marked as valid in admin

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
Copy link

m2-assistant bot commented Dec 21, 2020

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

@m2-community-project m2-community-project bot added Priority: P1 Once P0 defects have been fixed, a defect having this priority is the next candidate for fixing. Severity: S1 Affects critical data or functionality and forces users to employ a workaround. labels Dec 21, 2020
@engcom-Golf
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev ihor-sviziev self-assigned this Dec 21, 2020
@m2-community-project m2-community-project bot moved this from Pending Review to Review in Progress in High Priority Pull Requests Dashboard Dec 21, 2020
@m2-community-project m2-community-project bot moved this from Review in Progress to Pending Review in High Priority Pull Requests Dashboard Dec 21, 2020
@@ -114,6 +114,9 @@ private function multiThreadsExecute($userFunctions)
// phpcs:ignore Magento2.CodeAnalysis.EmptyBlock,Magento2.Functions.DiscouragedFunction
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this ignoring of empty block could be removed?

Suggested change
// phpcs:ignore Magento2.CodeAnalysis.EmptyBlock,Magento2.Functions.DiscouragedFunction
// phpcs:ignore Magento2.Functions.DiscouragedFunction

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

public function closureFunctionsProvider(): array
{
return [
'more_threads_than_functions' => [
Copy link
Contributor

@ihor-sviziev ihor-sviziev Dec 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also add coverage for cases when it's mess threads than functions and when it's equal? Just to make sure it works fine as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for looking into it, will do

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added variations

…functions(i.e. indexer dimensions) is lower than the MAGE_INDEXER_THREADS_COUNT env variable
@engcom-Golf
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev
Copy link
Contributor

ihor-sviziev commented Dec 21, 2020

@magento run Functional Tests B2B

Looks good. Let's wait for test results

@magento-engcom-team
Copy link
Contributor

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

@engcom-Bravo
Copy link
Contributor

✔️ QA Passed

Manual testing scenario

  1. Generate a small profile for performance testing bin/magento setup:performance:generate-fixtures setup/performance-toolkit/profiles/ce/small.xml
  2. Run fulltext_search reindex with parameter MAGE_INDEXER_THREADS_COUNT > {stores count} MAGE_INDEXER_THREADS_COUNT=4 php bin/magento indexer:reindex catalogsearch_fulltext
  3. While reindex is not finished, disable Elasticsearch in a separate terminal window sudo service elasticsearch stop

Before applying changes provided in the PR, the Process Manager exited successfully
exitedpng

After switching to the PR, the Process Manager exits with Fail in child process error
exitedpng_PR

@zakdma
Copy link
Contributor

zakdma commented Dec 26, 2020

@magento-engcom-team
Copy link
Contributor

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

@magento-engcom-team magento-engcom-team merged commit 4b460ab into magento:2.4-develop Dec 26, 2020
@m2-assistant
Copy link

m2-assistant bot commented Dec 26, 2020

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.

@gabrieldagama gabrieldagama moved this from Merge in Progress to Recently Merged in High Priority Pull Requests Dashboard Jan 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Award: bug fix Award: test coverage Component: Indexer Priority: P1 Once P0 defects have been fixed, a defect having this priority is the next candidate for fixing. Progress: accept Release Line: 2.4 Severity: S1 Affects critical data or functionality and forces users to employ a workaround.
Projects
None yet
6 participants