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-32397 Ensure delta writer is stopped earlier to avoid crash #19176

Merged
merged 1 commit into from
Oct 3, 2024
Merged

HPCC-32397 Ensure delta writer is stopped earlier to avoid crash #19176

merged 1 commit into from
Oct 3, 2024

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Oct 3, 2024 •
edited
Loading

The delta writer must be stopped during closedown, before other dependent members of the SDS manager are destroyed.

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:

@jakesmith
HPCC-32397 Ensure delta writer is stopped earlier to avoid crash
36085b2 
The delta writer must be stopped during closedown, before
other dependent members of the SDS manager are destroyed.

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 3, 2024

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

Jirabot Action Result:
Assigning user: jake.smith@lexisnexisrisk.com
Workflow Transition To: Merge Pending
Updated PR

jakesmith
jakesmith commented Oct 3, 2024
View reviewed changes
dali/base/dasds.cpp
@@ -2225,7 +2225,7 @@ void CDeltaWriter::addToQueue(CTransactionItem *item)
++totalQueueLimitHits;
// force a synchronous save
CCycleTimer timer;
PROGLOG("Forcing synchronous save of %u transactions", (unsigned)pending.size());
PROGLOG("Forcing synchronous save of %u transactions (pendingSz=%zu)", (unsigned)pending.size(), pendingSz);
Copy link
Member Author

Choose a reason for hiding this comment

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

totally incidental change - feel free to reject for it to go into a separate PR

jakesmith
jakesmith commented Oct 3, 2024
View reviewed changes
dali/base/dasds.cpp
@@ -6056,6 +6056,7 @@ CCovenSDSManager::~CCovenSDSManager()
{
if (unhandledThread) unhandledThread->join();
if (coalesce) coalesce->stop();
deltaWriter.stop();
Copy link
Member Author

Choose a reason for hiding this comment

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

NB: before this change, stop() would happen via member dtor.

jakesmith
jakesmith commented Oct 3, 2024
View reviewed changes
Copy link
Member Author

@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.

@ghalliday - please review.

Wasn't sure whether to target 9.6 or 9.8 - decided on 9.8 and pondered whether should go to master, because it is long term bug, that affects shutdown only.

@jakesmith jakesmith mentioned this pull request Oct 3, 2024
Merged
39 tasks
@ghalliday
Copy link
Member

I think it is fair to merge fixes for crashes and cores into the current release as long as they are relatively safe

@ghalliday ghalliday self-requested a review October 3, 2024 13:55
@ghalliday ghalliday merged commit 6823b35 into hpcc-systems:candidate-9.8.x Oct 3, 2024
50 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghalliday ghalliday ghalliday 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.
2 participants
@jakesmith @ghalliday