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

DAOS-16620 vos: exit scrub earlier during container destruction #15957

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

DAOS-16620 vos: exit scrub earlier during container destruction #15957

wants to merge 6 commits into from
+9 −0

Conversation

wangshilong
Copy link
Contributor

In sc_wait_until_should_continue(), the function could sleep for over 60 seconds before proceeding, causing container destruction timeouts and DER_BUSY errors during retries. This fix adds 1-second interval checks for sc_cont_is_stopping() during sleep cycles.

Additionally, enhanced error logging when container destruction is already in progress.

Test-tag: test_soak_smoke

Before requesting gatekeeper:

  • Two review approvals and any prior change requests have been resolved.
  • Testing is complete and all tests passed or there is a reason documented in the PR why it should be force landed and forced-landing tag is set.
  • Features: (or Test-tag*) commit pragma was used or there is a reason documented that there are no appropriate tags for this PR.
  • Commit messages follows the guidelines outlined here.
  • Any tests skipped by the ticket being addressed have been run and passed in the PR.

Gatekeeper:

  • You are the appropriate gatekeeper to be landing the patch.
  • The PR has 2 reviews by people familiar with the code, including appropriate owners.
  • Githooks were used. If not, request that user install them and check copyright dates.
  • Checkpatch issues are resolved. Pay particular attention to ones that will show up on future PRs.
  • All builds have passed. Check non-required builds for any new compiler warnings.
  • Sufficient testing is done. Check feature pragmas and test tags and that tests skipped for the ticket are run and now pass with the changes.
  • If applicable, the PR has addressed any potential version compatibility issues.
  • Check the target branch. If it is master branch, should the PR go to a feature branch? If it is a release branch, does it have merge approval in the JIRA ticket.
  • Extra checks if forced landing is requested
    • Review comments are sufficiently resolved, particularly by prior reviewers that requested changes.
    • No new NLT or valgrind warnings. Check the classic view.
    • Quick-build or Quick-functional is not used.
  • Fix the commit message upon landing. Check the standard here. Edit it to create a single commit. If necessary, ask submitter for a new summary.

@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 22, 2025 •
edited
Loading

Ticket title is 'soak/smoke.py:SoakSmoke.test_soak_smoke - failed to destroy container TestContainer_1: DER_IO(-2001)'
Status is 'In Review'
Labels: '2.6.1_issue,2.6.1rc2,2.6.2tb2,2.6.3rc2,2.6.3rc3,2.7.101tb,ci_2.6_weekly,ci_master_weekly,weekly_test'
https://daosio.atlassian.net/browse/DAOS-16620

@wangshilong wangshilong changed the title DAOS-16620 vos: Exit scrub earlier during container destruction DAOS-16620 vos: exit scrub earlier during container destruction Feb 22, 2025
@daosbuild1
Copy link
Collaborator

Test stage NLT on EL 8.8 completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-15957/2/testReport/

@wangshilong
DAOS-16620 vos: Exit scrub earlier during container destruction
38c35c5 
In sc_wait_until_should_continue(), the function could sleep for over
60 seconds before proceeding, causing container destruction timeouts
and DER_BUSY errors during retries. This fix adds 1-second interval
checks for sc_cont_is_stopping() during sleep cycles.

Additionally, enhanced error logging when container destruction is
already in progress.

Test-tag: test_soak_smoke pr
Signed-off-by: Wang Shilong <[email protected]>
@wangshilong wangshilong marked this pull request as ready for review February 24, 2025 02:43
@wangshilong wangshilong requested review from a team as code owners February 24, 2025 02:43
NiuYawei
NiuYawei requested changes Feb 24, 2025
View reviewed changes
src/vos/vos_pool_scrub.c Outdated
break;
sc_sleep(ctx, 1000);
sleep_seconds--;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

sched_req_wakeup(cont->sc_pool->spc_scrubbing_req) is called on VOS container destroy, this is not necessary.

@wangshilong wangshilong requested a review from NiuYawei February 25, 2025 02:05
@wangshilong
test tag
97b3557 
Test-tag: test_soak_smoke pr
Signed-off-by: Wang Shilong <[email protected]>
@daosbuild1
Copy link
Collaborator

Test stage Functional Hardware Medium Verbs Provider completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-15957/5/execution/node/1557/log

NiuYawei
NiuYawei previously approved these changes Feb 27, 2025
View reviewed changes
Nasf-Fan
Nasf-Fan previously approved these changes Feb 27, 2025
View reviewed changes
src/vos/vos_pool_scrub.c Outdated
if (sc_mode(ctx) == DAOS_SCRUB_MODE_TIMED) {
struct timespec now;
uint64_t msec_between;

d_gettime(&now);
while ((msec_between = sc_get_ms_between_scrubs(ctx)) > 0) {
d_tm_set_gauge(ctx->sc_metrics.scm_next_csum_scrub, msec_between);
if (sc_cont_is_stopping(ctx))
Copy link
Contributor

Choose a reason for hiding this comment

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

Strictly, checking stopping before d_tm_set_gauge() or after sc_sleep() seems better. Anyway, not serious, can be adjusted latter.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right. fixed.

@wangshilong wangshilong dismissed stale reviews from Nasf-Fan and NiuYawei via 9631f72 February 27, 2025 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nasf-Fan Nasf-Fan Nasf-Fan approved these changes

@jolivier23 jolivier23 Awaiting requested review from jolivier23

@ryon-jensen ryon-jensen Awaiting requested review from ryon-jensen

@NiuYawei NiuYawei Awaiting requested review from NiuYawei

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wangshilong @daosbuild1 @NiuYawei @Nasf-Fan