Skip to content

Commit

Permalink
Merge pull request #5804 from chu11/issue5789
Browse files Browse the repository at this point in the history
kvs: remove excessive logging
  • Loading branch information
mergify[bot] committed Mar 18, 2024
2 parents 793add7 + 6871f7e commit b049561
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions src/modules/kvs/kvs.c
Original file line number Diff line number Diff line change
Expand Up @@ -950,8 +950,6 @@ static void kvstxn_apply (kvstxn_t *kt)
assert (root);

if (root->remove) {
flux_log (ctx->h, LOG_DEBUG, "%s: namespace %s removed", __FUNCTION__,
ns);
errnum = ENOTSUP;
goto done;
}
Expand Down Expand Up @@ -2066,14 +2064,15 @@ static void error_event_cb (flux_t *h, flux_msg_handler_t *mh,
}

/* if root not initialized, nothing to do
* - it is ok that the namespace be marked for removal, we may be
* cleaning up lingering transactions.
* - note that it is possible the namespace has been marked for
* removal, we may be cleaning up lingering transactions and
* need to report to those callers that namespace not available
* via finalize_transaction_bynames() below.
* - i.e. we're calling kvsroot_mgr_lookup_root() not
* kvsroot_mgr_lookup_root_safe().
*/
if (!(root = kvsroot_mgr_lookup_root (ctx->krm, ns))) {
flux_log (ctx->h, LOG_ERR, "%s: received unknown namespace %s",
__FUNCTION__, ns);
if (!(root = kvsroot_mgr_lookup_root (ctx->krm, ns)))
return;
}

finalize_transaction_bynames (ctx, root, names, errnum);
}
Expand Down Expand Up @@ -2125,11 +2124,8 @@ static void setroot_event_cb (flux_t *h, flux_msg_handler_t *mh,
* order (commit/fence completes before namespace removed, but
* namespace remove event received before setroot).
*/
if (!(root = kvsroot_mgr_lookup_root (ctx->krm, ns))) {
flux_log (ctx->h, LOG_ERR, "%s: received unknown namespace %s",
__FUNCTION__, ns);
if (!(root = kvsroot_mgr_lookup_root (ctx->krm, ns)))
return;
}

if (root->setroot_pause) {
flux_msg_t *msgcpy;
Expand Down

0 comments on commit b049561

Please sign in to comment.