From 192453e717de52d3ef7297612523e63dae0e591d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 10 Apr 2020 10:58:23 -0700 Subject: [PATCH] scoutfs: add server error messages Add specific error messages for failures that can happen as the server commits log trees from the client. These are severe enough that we'd like to know about them. Signed-off-by: Zach Brown --- kmod/src/server.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/kmod/src/server.c b/kmod/src/server.c index d0106c8a..0bdbedd3 100644 --- a/kmod/src/server.c +++ b/kmod/src/server.c @@ -474,8 +474,10 @@ static int server_commit_log_trees(struct super_block *sb, lt = arg; ret = hold_commit(sb); - if (ret < 0) + if (ret < 0) { + scoutfs_err(sb, "server error preparing commit: %d", ret); goto out; + } mutex_lock(&server->logs_mutex); @@ -485,13 +487,17 @@ static int server_commit_log_trees(struct super_block *sb, ltk.nr = le64_to_be64(lt->nr); ret = scoutfs_btree_lookup(sb, &super->logs_root, <k, sizeof(ltk), &iref); - if (ret < 0 && ret != -ENOENT) + if (ret < 0 && ret != -ENOENT) { + scoutfs_err(sb, "server error finding client logs: %d", ret); goto unlock; + } if (ret == 0) { if (iref.val_len == sizeof(struct scoutfs_log_trees_val)) { memcpy(<v, iref.val, iref.val_len); } else { ret = -EIO; + scoutfs_err(sb, "server error, invalid log item: %d", + ret); } scoutfs_btree_put_iref(&iref); if (ret < 0) @@ -517,11 +523,15 @@ static int server_commit_log_trees(struct super_block *sb, ret = scoutfs_btree_update(sb, &server->alloc, &server->wri, &super->logs_root, <k, sizeof(ltk), <v, sizeof(ltv)); + if (ret < 0) + scoutfs_err(sb, "server error updating client logs: %d", ret); unlock: mutex_unlock(&server->logs_mutex); ret = apply_commit(sb, ret); + if (ret < 0) + scoutfs_err(sb, "server error commiting client logs: %d", ret); out: WARN_ON_ONCE(ret < 0); return scoutfs_net_response(sb, conn, cmd, id, ret, NULL, 0);