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

DAOS-16916 container: check inflight open #15682

Merged
merged 7 commits into from
Jan 16, 2025
Merged

DAOS-16916 container: check inflight open #15682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5dafc6b
DAOS-16916 container: check inflight open
wangdi1 Jan 3, 2025
6f14810
DAOS-16916 container: fix word
wangdi1 Jan 8, 2025
676dc46
DAOS-16916 container: further update
wangdi1 Jan 8, 2025
8eeafe7
DAOS-16916 container: fix spelling
wangdi1 Jan 10, 2025
b0dff0f
DAOS-16916 container: wait 50ms before retry
wangdi1 Jan 15, 2025
d581ddf
Update srv_target.c
jolivier23 Jan 16, 2025
d1bda9f
Update container.h
jolivier23 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions src/container/srv_target.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* (C) Copyright 2016-2024 Intel Corporation.

Check failure on line 2 in src/container/srv_target.c

View workflow job for this annotation

GitHub Actions / Copyright check 

Copyright out of date
* (C) Copyright 2025 Google LLC
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -1607,11 +1608,23 @@
*/
D_ASSERT(hdl->sch_cont != NULL);
D_ASSERT(hdl->sch_cont->sc_pool != NULL);

hdl->sch_cont->sc_open++;
if (hdl->sch_cont->sc_open > 1) {
/* If there is an inflight open being stuck, then
* let's retry and wait until it finished.
*/
if (hdl->sch_cont->sc_open_initializing) {
hdl->sch_cont->sc_open--;
D_GOTO(err_cont, rc = -DER_AGAIN);
}

if (hdl->sch_cont->sc_open > 1)
goto opened;
/* Only go through if the 1st open succeeds */
if (hdl->sch_cont->sc_props_fetched)
goto opened;
}

hdl->sch_cont->sc_open_initializing = 1;
if (ds_pool_restricted(hdl->sch_cont->sc_pool->spc_pool, false))
goto csum_init;

Expand Down Expand Up @@ -1646,6 +1659,8 @@
rc = ds_cont_csummer_init(hdl->sch_cont);
if (rc != 0)
D_GOTO(err_dtx, rc);

hdl->sch_cont->sc_open_initializing = 0;
}
opened:
if (cont_hdl != NULL) {
Expand All @@ -1663,6 +1678,7 @@
dtx_cont_close(hdl->sch_cont, true);

err_cont:
hdl->sch_cont->sc_open_initializing = 0;
Copy link
Contributor

Choose a reason for hiding this comment

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

This "sc_open_initializing" flag will be cleared when second open return -DER_AGAIN? Why don't we simply use a ABT_Mutex to serialize above open procedures?

if (daos_handle_is_valid(poh)) {
int rc_tmp;

Expand Down Expand Up @@ -1750,9 +1766,15 @@
D_DEBUG(DB_TRACE, "open pool/cont/hdl "DF_UUID"/"DF_UUID"/"DF_UUID"\n",
DP_UUID(pool_uuid), DP_UUID(cont_uuid), DP_UUID(cont_hdl_uuid));

retry:
rc = ds_pool_thread_collective(pool_uuid, PO_COMP_ST_NEW | PO_COMP_ST_DOWN |
PO_COMP_ST_DOWNOUT, cont_open_one, &arg, 0);
if (rc != 0)
if (rc != 0) {
if (rc == -DER_AGAIN) {
dss_sleep(50);
goto retry;
Copy link
Contributor

Choose a reason for hiding this comment

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

Busy retry? It may be better to wait for former inflight opening to return and then check again.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is a collective operation. which will yield, but I assume wait a few ms might be ok.

}

/* Once it exclude the target from the pool, since the target
* might still in the cart group, so IV cont open might still
* come to this target, especially if cont open/close will be
Expand All @@ -1762,6 +1784,7 @@
D_ERROR("open "DF_UUID"/"DF_UUID"/"DF_UUID":"DF_RC"\n",
DP_UUID(pool_uuid), DP_UUID(cont_uuid),
DP_UUID(cont_hdl_uuid), DP_RC(rc));
}

return rc;
}
Expand Down
20 changes: 6 additions & 14 deletions src/include/daos_srv/container.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* (C) Copyright 2015-2024 Intel Corporation.

Check failure on line 2 in src/include/daos_srv/container.h

View workflow job for this annotation

GitHub Actions / Copyright check 

Copyright out of date
* (C) Copyright 2025 Google LLC
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -66,20 +67,11 @@
ABT_cond sc_scrub_cond;
ABT_cond sc_rebuild_cond;
ABT_cond sc_fini_cond;
uint32_t sc_dtx_resyncing:1,
sc_dtx_reindex:1,
sc_dtx_reindex_abort:1,
sc_dtx_delay_reset:1,
sc_dtx_registered:1,
sc_props_fetched:1,
sc_stopping:1,
sc_destroying:1,
sc_vos_agg_active:1,
sc_ec_agg_active:1,
/* flag of CONT_CAPA_READ_DATA/_WRITE_DATA disabled */
sc_rw_disabled:1,
sc_scrubbing:1,
sc_rebuilding:1;
uint32_t sc_dtx_resyncing : 1, sc_dtx_reindex : 1, sc_dtx_reindex_abort : 1,
sc_dtx_delay_reset : 1, sc_dtx_registered : 1, sc_props_fetched : 1, sc_stopping : 1,
sc_destroying : 1, sc_vos_agg_active : 1, sc_ec_agg_active : 1,
/* flag of CONT_CAPA_READ_DATA/_WRITE_DATA disabled */
sc_rw_disabled : 1, sc_scrubbing : 1, sc_rebuilding : 1, sc_open_initializing : 1;
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this the recommended coding style?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is actually only suppose to change 1 line, not sure why it messed up like this, which might due to git-hook sth.

Copy link
Contributor

Choose a reason for hiding this comment

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

This might be messed up by clang-format hooks.

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, clang-format does this. I believe if you use ; instead of comma, you still use same space and don't have the formatting issue

Copy link
Contributor

Choose a reason for hiding this comment

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

verified (though we do this in other places in DAOS)

#include <stdint.h>
#include <stdio.h>

struct foo {
	uint64_t foo;
	uint32_t bar:1;
	uint32_t fub:1;
	uint32_t other;
};

int main(int argc, char ** argv)
{
	printf("%zu\n", sizeof(struct foo));
}

This prints 16 which means bar and fub are placed together.

Copy link
Contributor

Choose a reason for hiding this comment

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

in fact, you can make this change without any formatting and clang-format will fix it and make it look nice

uint32_t sc_dtx_batched_gen;
/* Tracks the schedule request for aggregation ULT */
struct sched_request *sc_agg_req;
Expand Down
Loading