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

HPCC-32072 Thor worker cleaner shutdown #18771

Merged
merged 1 commit into from
Aug 5, 2024
Merged

HPCC-32072 Thor worker cleaner shutdown #18771

merged 1 commit into from
Aug 5, 2024

Conversation

mckellyln
Copy link
Contributor

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-32072

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR
Assigning user: [email protected]

@mckellyln mckellyln force-pushed the thorslave_shutdown branch from 65f03db to 11d8b2d Compare June 18, 2024 19:11
@mckellyln
Copy link
Contributor Author

Not sure if this is really necessary but do like when Thor shuts down clean (esp when trying to debug MODULE_EXIT code).

@mckellyln mckellyln requested a review from jakesmith June 19, 2024 16:17
jakesmith
jakesmith reviewed Jul 11, 2024
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@mckellyln - a few questions.

thorlcr/slave/thslavemain.cpp Show resolved Hide resolved
thorlcr/slave/thslavemain.cpp Outdated Show resolved Hide resolved
system/mp/mpcomm.cpp
getReceiveQueueDetails(buf);
if (buf.length())
LOG(MCdebugInfo, "MP: Orphan check\n%s",buf.str());
if (dumpQueue)
Copy link
Member

Choose a reason for hiding this comment

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

is this really an incidental change? Why suppress dumping of unconsumed MP messages if slave has been told to shutdown by manager, vs if it hasn't?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

On clean shutdown I didn't want the MP Orphan check dump in the logs

Copy link
Member

Choose a reason for hiding this comment

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

ok, I don't think message are useful in general.

@mckellyln mckellyln force-pushed the thorslave_shutdown branch 2 times, most recently from 0b139f9 to 9371db4 Compare July 29, 2024 13:48
@mckellyln mckellyln changed the base branch from candidate-9.6.x to candidate-9.8.x July 29, 2024 13:49
@mckellyln
Copy link
Contributor Author

@jakesmith one more time, I've also rebased onto candidate-9.8.x.

@mckellyln mckellyln requested a review from jakesmith July 29, 2024 15:24
@mckellyln mckellyln force-pushed the thorslave_shutdown branch 3 times, most recently from 22f532e to 8495bd7 Compare July 29, 2024 15:51
jakesmith
jakesmith approved these changes Jul 30, 2024
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@mckellyln - looks good. Please squash.

@mckellyln mckellyln force-pushed the thorslave_shutdown branch from 8495bd7 to 7d9a990 Compare July 30, 2024 14:27
@mckellyln
Copy link
Contributor Author

Squashed

@ghalliday ghalliday merged commit f61f861 into hpcc-systems:candidate-9.8.x Aug 5, 2024
45 of 47 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakesmith jakesmith jakesmith approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mckellyln @jakesmith @ghalliday