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-11955 pool: Ensure a PS is inside pool (#13046) #14448

Merged
merged 2 commits into from
May 28, 2024
Merged

DAOS-11955 pool: Ensure a PS is inside pool (#13046) #14448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef5e51c
DAOS-11955 pool: Ensure a PS is inside pool (#13046)
liw Oct 3, 2023
9b7547e
DAOS-14730 pool: Clean up map update logging (#13709)
liw Feb 7, 2024
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
31 changes: 12 additions & 19 deletions src/pool/cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,32 +471,23 @@ int
dc_pool_map_update(struct dc_pool *pool, struct pool_map *map, bool connect)
{
unsigned int map_version;
unsigned int map_version_before = 0;
int rc;

D_ASSERT(map != NULL);
map_version = pool_map_get_version(map);

if (pool->dp_map == NULL) {
rc = pl_map_update(pool->dp_pool, map, connect, DEFAULT_PL_TYPE);
if (rc != 0)
D_GOTO(out, rc);

D_DEBUG(DB_MD, DF_UUID": init pool map: %u\n",
DP_UUID(pool->dp_pool), pool_map_get_version(map));
D_GOTO(out_update, rc = 0);
}
if (pool->dp_map != NULL)
map_version_before = pool_map_get_version(pool->dp_map);

if (map_version < pool_map_get_version(pool->dp_map)) {
D_DEBUG(DB_MD, DF_UUID": got older pool map: %u -> %u %p\n",
DP_UUID(pool->dp_pool),
pool_map_get_version(pool->dp_map), map_version, pool);
if (map_version <= map_version_before) {
D_DEBUG(DB_MD, DF_UUID ": ignored pool map update: version=%u->%u pool=%p\n",
DP_UUID(pool->dp_pool), map_version_before, map_version, pool);
D_GOTO(out, rc = 0);
}

D_DEBUG(DB_MD, DF_UUID": updating pool map: %u -> %u\n",
DP_UUID(pool->dp_pool),
pool->dp_map == NULL ?
0 : pool_map_get_version(pool->dp_map), map_version);
D_DEBUG(DB_MD, DF_UUID ": updating pool map: version=%u->%u\n", DP_UUID(pool->dp_pool),
map_version_before, map_version);

rc = pl_map_update(pool->dp_pool, map, connect, DEFAULT_PL_TYPE);
if (rc != 0) {
Expand All @@ -505,12 +496,14 @@ dc_pool_map_update(struct dc_pool *pool, struct pool_map *map, bool connect)
D_GOTO(out, rc);
}

pool_map_decref(pool->dp_map);
out_update:
if (pool->dp_map != NULL)
pool_map_decref(pool->dp_map);
pool_map_addref(map);
pool->dp_map = map;
if (pool->dp_map_version_known < map_version)
pool->dp_map_version_known = map_version;
D_INFO(DF_UUID ": updated pool map: version=%u->%u\n", DP_UUID(pool->dp_pool),
map_version_before, map_version);
out:
return rc;
}
Expand Down
13 changes: 11 additions & 2 deletions src/pool/srv_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,17 @@
#include <daos_security.h>
#include <gurt/telemetry_common.h>

/* Map status of ranks that make up the pool group */
#define POOL_GROUP_MAP_STATUS (PO_COMP_ST_UP | PO_COMP_ST_UPIN | PO_COMP_ST_DRAIN)
/* Map states of ranks that make up the pool group */
#define POOL_GROUP_MAP_STATES (PO_COMP_ST_UP | PO_COMP_ST_UPIN | PO_COMP_ST_DRAIN)

/* Map states of ranks that make up the pool service */
#define POOL_SVC_MAP_STATES (PO_COMP_ST_UP | PO_COMP_ST_UPIN)

/*
* Since we want all PS replicas to belong to the pool group,
* POOL_SVC_MAP_STATES must be a subset of POOL_GROUP_MAP_STATES.
*/
D_CASSERT((POOL_SVC_MAP_STATES & POOL_GROUP_MAP_STATES) == POOL_SVC_MAP_STATES);

/**
* Global pool metrics
Expand Down
Loading
Loading