Skip to content
Snippets Groups Projects
Commit 59431ed6 authored by Christopher Haine's avatar Christopher Haine
Browse files

minor fixes

parent 22dbabc9
Branches
No related tags found
No related merge requests found
...@@ -312,6 +312,7 @@ mstro_group_seal(mstro_group g) ...@@ -312,6 +312,7 @@ mstro_group_seal(mstro_group g)
HASH_ITER(hh, g->members, el, tmp) { HASH_ITER(hh, g->members, el, tmp) {
m->declared_members[i] = malloc(sizeof(Mstro__Pool__UUID)); m->declared_members[i] = malloc(sizeof(Mstro__Pool__UUID));
/* need to ensure the GID is ready */ /* need to ensure the GID is ready */
if(!mstro_cdo_state_check(el->entry, MSTRO_CDO_STATE_SEALED)) {
mstro_status s = mstro_cdo_seal(el->entry); mstro_status s = mstro_cdo_seal(el->entry);
if(s!=MSTRO_OK) { if(s!=MSTRO_OK) {
ERR("Failed to seal declared group member: %d\n", s); ERR("Failed to seal declared group member: %d\n", s);
...@@ -325,7 +326,7 @@ mstro_group_seal(mstro_group g) ...@@ -325,7 +326,7 @@ mstro_group_seal(mstro_group g)
goto BAILOUT_FREE; goto BAILOUT_FREE;
} }
}
mstro__pool__uuid__init(m->declared_members[i]); mstro__pool__uuid__init(m->declared_members[i]);
m->declared_members[i]->qw0 = el->entry->gid.qw[0]; m->declared_members[i]->qw0 = el->entry->gid.qw[0];
m->declared_members[i]->qw1 = el->entry->gid.qw[1]; m->declared_members[i]->qw1 = el->entry->gid.qw[1];
......
...@@ -381,16 +381,18 @@ mstro_transport_execute( ...@@ -381,16 +381,18 @@ mstro_transport_execute(
if(s==MSTRO_OK) { if(s==MSTRO_OK) {
src_size=*(int64_t*)sizep; src_size=*(int64_t*)sizep;
} else if(s==MSTRO_NOENT && type==MSTRO_CDO_ATTR_VALUE_INVALID) { } else if(s==MSTRO_NOENT && type==MSTRO_CDO_ATTR_VALUE_INVALID) {
ERR("Attribute not found or value invalid\n");
src_size=-1; src_size=-1;
} else { } else {
ERR("Failed to look up %s (%d: %s)\n", ERR("Failed to look up %s (%d: %s)\n",
MSTRO_ATTR_CORE_CDO_SCOPE_LOCAL_SIZE, s, mstro_status_description(s)); MSTRO_ATTR_CORE_CDO_SCOPE_LOCAL_SIZE, s, mstro_status_description(s));
return MSTRO_FAIL; return MSTRO_FAIL;
} }
// XXX Let's use mamba, while we figure out the attribute corruption
// src_size = cdo->mamba_array->allocation->n_bytes;
if (src_size != ticket->data_size) { if (ticket->data_size == 0) {
DEBUG("0-transport\n");
}
else if (src_size != ticket->data_size) {
ERR("SRC cdo has a size (%" PRIi64 ") that doesn't match ticket-specified size (%" PRIi64 ")\n", ERR("SRC cdo has a size (%" PRIi64 ") that doesn't match ticket-specified size (%" PRIi64 ")\n",
src_size, ticket->data_size); src_size, ticket->data_size);
return MSTRO_FAIL; return MSTRO_FAIL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment