Skip to content

Commit

Permalink
Merge remote-tracking branch 'comm/release/2.6' into jeffolivier/goog…
Browse files Browse the repository at this point in the history
…le/2.6

Change-Id: I3b3957e147cbf0e8d725f8c36c0ec4f1c7de35fc
  • Loading branch information
jolivier23 committed Sep 24, 2024
2 parents 5f496a8 + 752837a commit 0d39afc
Show file tree
Hide file tree
Showing 277 changed files with 19,483 additions and 13,931 deletions.
2 changes: 1 addition & 1 deletion TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.1-rc1
2.6.1-rc2
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
daos (2.6.1-2) unstable; urgency=medium
[ Phillip Henderson ]
* Second release candidate for 2.6.1

-- Phillip Henderson <[email protected]> Fri, 20 Sep 2024 22:48:00 -0500

daos (2.6.1-1) unstable; urgency=medium
[ Phillip Henderson ]
* First release candidate for 2.6.1
Expand Down
2 changes: 1 addition & 1 deletion src/client/java/daos-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.16.3</version>
<version>3.25.5</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand Down
107 changes: 51 additions & 56 deletions src/container/srv_target.c
Original file line number Diff line number Diff line change
Expand Up @@ -929,9 +929,10 @@ cont_child_start(struct ds_pool_child *pool_child, const uuid_t co_uuid,
* 2. Pool is going to be destroyed, or;
* 3. Pool service is going to be stopped;
*/
if (cont_child->sc_stopping) {
D_ERROR(DF_CONT"[%d]: Container is in stopping\n",
DP_CONT(pool_child->spc_uuid, co_uuid), tgt_id);
if (cont_child->sc_stopping || cont_child->sc_destroying) {
D_ERROR(DF_CONT"[%d]: Container is being stopped or destroyed (s=%d, d=%d)\n",
DP_CONT(pool_child->spc_uuid, co_uuid), tgt_id,
cont_child->sc_stopping, cont_child->sc_destroying);
rc = -DER_SHUTDOWN;
} else if (!cont_child_started(cont_child)) {
if (!ds_pool_skip_for_check(pool_child->spc_pool)) {
Expand Down Expand Up @@ -1200,71 +1201,58 @@ cont_child_destroy_one(void *vin)
struct dsm_tls *tls = dsm_tls_get();
struct cont_tgt_destroy_in *in = vin;
struct ds_pool_child *pool;
int rc, retry_cnt = 0;
struct ds_cont_child *cont;
int rc;

pool = ds_pool_child_lookup(in->tdi_pool_uuid);
if (pool == NULL)
D_GOTO(out, rc = -DER_NO_HDL);

while (1) {
struct ds_cont_child *cont;
rc = cont_child_lookup(tls->dt_cont_cache, in->tdi_uuid,
in->tdi_pool_uuid, false /* create */, &cont);
if (rc == -DER_NONEXIST)
D_GOTO(out_pool, rc = 0);

rc = cont_child_lookup(tls->dt_cont_cache, in->tdi_uuid,
in->tdi_pool_uuid, false /* create */,
&cont);
if (rc == -DER_NONEXIST)
break;

if (rc != 0)
D_GOTO(out_pool, rc);
if (rc != 0)
D_GOTO(out_pool, rc);

if (cont->sc_open > 0) {
if (retry_cnt > 0)
D_ERROR(DF_CONT": Container is re-opened (%d) by race\n",
DP_CONT(cont->sc_pool->spc_uuid, cont->sc_uuid),
cont->sc_open);
else
D_ERROR(DF_CONT": Container is still in open(%d)\n",
DP_CONT(cont->sc_pool->spc_uuid, cont->sc_uuid),
cont->sc_open);
cont_child_put(tls->dt_cont_cache, cont);
D_GOTO(out_pool, rc = -DER_BUSY);
}
if (cont->sc_open > 0) {
D_ERROR(DF_CONT": Container is still in open(%d)\n",
DP_CONT(cont->sc_pool->spc_uuid, cont->sc_uuid), cont->sc_open);
cont_child_put(tls->dt_cont_cache, cont);
D_GOTO(out_pool, rc = -DER_BUSY);
}

cont_child_stop(cont);
if (cont->sc_destroying) {
cont_child_put(tls->dt_cont_cache, cont);
D_GOTO(out_pool, rc = -DER_BUSY);
}
cont->sc_destroying = 1; /* nobody can take refcount anymore */

ABT_mutex_lock(cont->sc_mutex);
if (cont->sc_dtx_resyncing)
ABT_cond_wait(cont->sc_dtx_resync_cond, cont->sc_mutex);
ABT_mutex_unlock(cont->sc_mutex);
cont_child_stop(cont);

/* Make sure checksum scrubbing has stopped */
ABT_mutex_lock(cont->sc_mutex);
if (cont->sc_scrubbing) {
sched_req_wakeup(cont->sc_pool->spc_scrubbing_req);
ABT_cond_wait(cont->sc_scrub_cond, cont->sc_mutex);
}
ABT_mutex_unlock(cont->sc_mutex);
ABT_mutex_lock(cont->sc_mutex);
if (cont->sc_dtx_resyncing)
ABT_cond_wait(cont->sc_dtx_resync_cond, cont->sc_mutex);
ABT_mutex_unlock(cont->sc_mutex);

/* Make sure rebuild has stopped */
ABT_mutex_lock(cont->sc_mutex);
if (cont->sc_rebuilding)
ABT_cond_wait(cont->sc_rebuild_cond, cont->sc_mutex);
ABT_mutex_unlock(cont->sc_mutex);
/* Make sure checksum scrubbing has stopped */
ABT_mutex_lock(cont->sc_mutex);
if (cont->sc_scrubbing) {
sched_req_wakeup(cont->sc_pool->spc_scrubbing_req);
ABT_cond_wait(cont->sc_scrub_cond, cont->sc_mutex);
}
ABT_mutex_unlock(cont->sc_mutex);

retry_cnt++;
if (retry_cnt > 1) {
D_ERROR("container is still in-use: open %u, resync %s, reindex %s\n",
cont->sc_open, cont->sc_dtx_resyncing ? "yes" : "no",
cont->sc_dtx_reindex ? "yes" : "no");
cont_child_put(tls->dt_cont_cache, cont);
D_GOTO(out_pool, rc = -DER_BUSY);
} /* else: resync should have completed, try again */
/* Make sure rebuild has stopped */
ABT_mutex_lock(cont->sc_mutex);
if (cont->sc_rebuilding)
ABT_cond_wait(cont->sc_rebuild_cond, cont->sc_mutex);
ABT_mutex_unlock(cont->sc_mutex);

/* nobody should see it again after eviction */
daos_lru_ref_evict_wait(tls->dt_cont_cache, &cont->sc_list);
daos_lru_ref_release(tls->dt_cont_cache, &cont->sc_list);
}
/* nobody should see it again after eviction */
daos_lru_ref_evict_wait(tls->dt_cont_cache, &cont->sc_list);
cont_child_put(tls->dt_cont_cache, cont);

D_DEBUG(DB_MD, DF_CONT": destroying vos container\n",
DP_CONT(pool->spc_uuid, in->tdi_uuid));
Expand Down Expand Up @@ -1375,7 +1363,7 @@ ds_cont_child_lookup(uuid_t pool_uuid, uuid_t cont_uuid,
if (rc != 0)
return rc;

if ((*ds_cont)->sc_stopping) {
if ((*ds_cont)->sc_stopping || (*ds_cont)->sc_destroying) {
cont_child_put(tls->dt_cont_cache, *ds_cont);
*ds_cont = NULL;
return -DER_SHUTDOWN;
Expand Down Expand Up @@ -2603,6 +2591,13 @@ cont_child_prop_update(void *data)
return rc;
}
D_ASSERT(child != NULL);
if (child->sc_stopping || child->sc_destroying) {
D_ERROR(DF_CONT" is being stopping or destroyed (s=%d, d=%d)\n",
DP_CONT(arg->cpa_pool_uuid, arg->cpa_cont_uuid),
child->sc_stopping, child->sc_destroying);
rc = -DER_SHUTDOWN;
goto out;
}
daos_props_2cont_props(arg->cpa_prop, &child->sc_props);

iv_entry = daos_prop_entry_get(arg->cpa_prop, DAOS_PROP_CO_STATUS);
Expand Down
20 changes: 11 additions & 9 deletions src/control/go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
module github.com/daos-stack/daos/src/control

go 1.20
go 1.21

toolchain go1.22.3

require (
github.com/Jille/raft-grpc-transport v1.2.0
github.com/desertbit/grumble v1.1.3
github.com/dustin/go-humanize v1.0.0
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/hashicorp/go-hclog v1.2.2
github.com/hashicorp/raft v1.3.9
github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210409134258-03c10cc3d4ea
Expand All @@ -18,18 +20,18 @@ require (
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.32.1
go.etcd.io/bbolt v1.3.5
golang.org/x/net v0.23.0
golang.org/x/sys v0.18.0
golang.org/x/net v0.26.0
golang.org/x/sys v0.21.0
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
google.golang.org/grpc v1.56.3
google.golang.org/protobuf v1.33.0
google.golang.org/grpc v1.66.2
google.golang.org/protobuf v1.34.1
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/armon/go-metrics v0.4.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/desertbit/closer/v3 v3.1.2 // indirect
github.com/desertbit/columnize v2.1.0+incompatible // indirect
github.com/desertbit/go-shlex v0.1.1 // indirect
Expand All @@ -46,5 +48,5 @@ require (
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/text v0.16.0 // indirect
)
Loading

0 comments on commit 0d39afc

Please sign in to comment.