summaryrefslogtreecommitdiffstats
path: root/xlators/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/protocol')
-rw-r--r--xlators/protocol/server/src/server-helpers.h3
-rw-r--r--xlators/protocol/server/src/server-protocol.c169
-rw-r--r--xlators/protocol/server/src/server-protocol.h1
-rw-r--r--xlators/protocol/server/src/server-resolve.c9
4 files changed, 176 insertions, 6 deletions
diff --git a/xlators/protocol/server/src/server-helpers.h b/xlators/protocol/server/src/server-helpers.h
index 039e0a2b346..de5b84de840 100644
--- a/xlators/protocol/server/src/server-helpers.h
+++ b/xlators/protocol/server/src/server-helpers.h
@@ -66,4 +66,7 @@ gf_del_locker (struct _lock_table *table, const char *volume,
int32_t
gf_direntry_to_bin (dir_entry_t *head, char *bufferp);
+void
+print_server_state (call_frame_t *frame, server_state_t *state, xlator_t *this, int request);
+
#endif /* __SERVER_HELPERS_H__ */
diff --git a/xlators/protocol/server/src/server-protocol.c b/xlators/protocol/server/src/server-protocol.c
index 2d8ec68dfa3..6a085f953cf 100644
--- a/xlators/protocol/server/src/server-protocol.c
+++ b/xlators/protocol/server/src/server-protocol.c
@@ -43,6 +43,143 @@
#include "statedump.h"
#include "md5.h"
+void
+print_resolve_vars (char *str, int size, server_resolve_t *resolve)
+{
+ int filled = 0;
+
+ if (!resolve) {
+ snprintf (str, size, "<nul>");
+ return;
+ }
+
+ if (resolve->fd_no)
+ filled += snprintf (str + filled, size - filled, "fd_no: %"PRId64" ", resolve->fd_no);
+ if (resolve->ino)
+ filled += snprintf (str + filled, size - filled, "ino: %llu ",
+ (unsigned long long) resolve->ino);
+ if (resolve->gen)
+ filled += snprintf (str + filled, size - filled, "gen: %"PRIu64" ", resolve->gen);
+ if (resolve->par)
+ filled += snprintf (str + filled, size - filled, "par: %llu ",
+ (unsigned long long) resolve->par);
+ if (resolve->path)
+ filled += snprintf (str + filled, size - filled, "path: %s ", resolve->path);
+ if (resolve->bname)
+ filled += snprintf (str + filled, size - filled, "bname: %s ", resolve->bname);
+ if (resolve->resolved)
+ filled += snprintf (str + filled, size - filled, "resolved: %s ", resolve->resolved);
+ if (resolve->comp_count)
+ filled += snprintf (str + filled, size - filled, "comp_count: %d ", resolve->comp_count);
+
+}
+
+void
+print_loc_vars (char *str, int size, loc_t *loc)
+{
+ int filled = 0;
+
+ if (!loc) {
+ snprintf (str, size, "<nul>");
+ return;
+ }
+
+ if (loc->path)
+ filled += snprintf (str + filled, size - filled, "path: %s ", loc->path);
+ if (loc->name)
+ snprintf (str + filled, size - filled, "name: %s ", loc->name);
+ if (loc->ino)
+ snprintf (str + filled, size - filled, "ino: %llu ",
+ (unsigned long long) loc->ino);
+
+
+}
+
+void
+print_state_vars (char *str, int size, server_state_t *state)
+{
+ int filled = 0;
+
+ if (state->trans)
+ filled = snprintf (str + filled, size - filled, "transport: %p ", state->trans);
+ if (state->bound_xl)
+ filled += snprintf (str + filled, size - filled, "xlator: %s ",state->bound_xl->name);
+ if (state->valid)
+ filled += snprintf (str + filled, size - filled, "valid: %d ", state->valid);
+ if (state->flags)
+ filled += snprintf (str + filled, size - filled, "flags: %d ", state->flags);
+ if (state->wbflags)
+ filled += snprintf (str + filled, size - filled, "wbflags: %d ", state->wbflags);
+ if (state->size)
+ filled += snprintf (str + filled, size - filled, "size: %Zu ", state->size);
+ if (state->offset)
+ filled += snprintf (str + filled, size - filled, "offset: %llu ",
+ (unsigned long long) state->offset);
+ if (state->cmd)
+ filled += snprintf (str + filled, size - filled, "cmd: %d ", state->cmd);
+ if (state->type)
+ filled += snprintf (str + filled, size - filled, "type: %d ", state->type);
+ if (state->name)
+ filled += snprintf (str + filled, size - filled, "name: %s ", state->name);
+ if (state->mask)
+ filled += snprintf (str + filled, size - filled, "mask: %d ", state->mask);
+ if (state->volume)
+ filled += snprintf (str + filled, size - filled, "volume: %s ", state->volume);
+
+}
+
+void
+print_server_state (call_frame_t *frame, server_state_t *state, xlator_t *this, int request)
+{
+ server_conf_t *conf = NULL;
+ char resolve_vars[256];
+ char resolve2_vars[256];
+ char loc_vars[256];
+ char loc2_vars[256];
+ char other_vars[512];
+
+ memset (resolve_vars, '\0', 256);
+ memset (resolve2_vars, '\0', 256);
+ memset (loc_vars, '\0', 256);
+ memset (loc2_vars, '\0', 256);
+ memset (other_vars, '\0', 512);
+
+ conf = this->private;
+ if (!conf->trace)
+ return;
+
+ if (request) {
+
+ print_resolve_vars (resolve_vars, 256, &state->resolve);
+ print_resolve_vars (resolve2_vars, 256, &state->resolve2);
+
+ print_loc_vars (loc_vars, 256, &state->loc);
+ print_loc_vars (loc2_vars, 256, &state->loc2);
+
+ print_state_vars (other_vars, 512, state);
+
+ gf_log (this->name, GF_LOG_NORMAL,
+ "[REQUEST] resolve = {%s} resolve2 = {%s} loc = {%s}"
+ " loc2 = {%s} State Vars = {%s}",
+ strlen (resolve_vars) ? resolve_vars : "<nul>",
+ strlen (resolve2_vars) ? resolve2_vars : "<nul>",
+ strlen (loc_vars) ? loc_vars : "<nul>",
+ strlen (loc2_vars) ? loc2_vars : "<nul>",
+ strlen (other_vars) ? other_vars : "<nul>"
+ );
+ } else {
+
+ print_loc_vars (loc_vars, 256, &state->loc);
+ print_state_vars (other_vars, 512, state);
+
+ gf_log (this->name, GF_LOG_NORMAL,
+ "[REPLY] loc = {%s} State Vars = {%s}",
+ strlen (loc_vars) ? loc_vars : "<nul>",
+ strlen (other_vars) ? other_vars : "<nul>"
+ );
+ }
+
+}
static void
protocol_server_reply (call_frame_t *frame, int type, int op,
@@ -55,14 +192,19 @@ protocol_server_reply (call_frame_t *frame, int type, int op,
transport_t *trans = NULL;
int ret = 0;
+ xlator_t *this = NULL;
+
bound_xl = BOUND_XL (frame);
state = CALL_STATE (frame);
trans = state->trans;
+ this = frame->this;
hdr->callid = hton64 (frame->root->unique);
hdr->type = hton32 (type);
hdr->op = hton32 (op);
+ print_server_state (frame, state, this, 0);
+
ret = transport_submit (trans, (char *)hdr, hdrlen, vector,
count, iobref);
if (ret < 0) {
@@ -3791,7 +3933,8 @@ server_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
return 0;
}
-int server_readdirp_resume (call_frame_t *frame, xlator_t *bound_xl)
+int
+server_readdirp_resume (call_frame_t *frame, xlator_t *bound_xl)
{
server_state_t *state = NULL;
@@ -3843,7 +3986,8 @@ server_readdirp (call_frame_t *frame, xlator_t *bound_xl, gf_hdr_common_t *hdr,
}
-int server_readdir_resume (call_frame_t *frame, xlator_t *bound_xl)
+int
+ server_readdir_resume (call_frame_t *frame, xlator_t *bound_xl)
{
server_state_t *state = NULL;
@@ -3895,7 +4039,8 @@ server_readdir (call_frame_t *frame, xlator_t *bound_xl,
return 0;
}
-int server_fsyncdir_resume (call_frame_t *frame, xlator_t *bound_xl)
+int
+server_fsyncdir_resume (call_frame_t *frame, xlator_t *bound_xl)
{
server_state_t *state = NULL;
@@ -4600,7 +4745,8 @@ server_rename (call_frame_t *frame, xlator_t *bound_xl,
return 0;
}
-int server_lk_resume (call_frame_t *frame, xlator_t *bound_xl)
+int
+server_lk_resume (call_frame_t *frame, xlator_t *bound_xl)
{
server_state_t *state = NULL;
@@ -6258,6 +6404,7 @@ init (xlator_t *this)
transport_t *trans = NULL;
server_conf_t *conf = NULL;
data_t *data = NULL;
+ data_t *trace = NULL;
if (this->children == NULL) {
gf_log (this->name, GF_LOG_ERROR,
@@ -6333,6 +6480,16 @@ init (xlator_t *this)
}
}
+ trace = dict_get (this->options, "trace");
+ if (trace) {
+ if (gf_string2boolean (trace->data,
+ &conf->trace) == -1) {
+ gf_log (this->name, GF_LOG_ERROR,
+ "'trace' takes on only boolean values.");
+ return -1;
+ }
+ }
+
#ifndef GF_DARWIN_HOST_OS
{
struct rlimit lim;
@@ -6517,5 +6674,9 @@ struct volume_options options[] = {
{ .key = {"verify-volfile-checksum"},
.type = GF_OPTION_TYPE_BOOL
},
+ { .key = {"trace"},
+ .type = GF_OPTION_TYPE_BOOL
+ },
+
{ .key = {NULL} },
};
diff --git a/xlators/protocol/server/src/server-protocol.h b/xlators/protocol/server/src/server-protocol.h
index 55bf4ad8f11..78bc138279a 100644
--- a/xlators/protocol/server/src/server-protocol.h
+++ b/xlators/protocol/server/src/server-protocol.h
@@ -107,6 +107,7 @@ typedef struct {
pthread_mutex_t mutex;
struct list_head conns;
gf_boolean_t verify_volfile_checksum;
+ gf_boolean_t trace;
} server_conf_t;
diff --git a/xlators/protocol/server/src/server-resolve.c b/xlators/protocol/server/src/server-resolve.c
index 3262d1e9192..f7a2205e588 100644
--- a/xlators/protocol/server/src/server-resolve.c
+++ b/xlators/protocol/server/src/server-resolve.c
@@ -291,7 +291,7 @@ resolve_entry_simple (call_frame_t *frame)
/* simple resolution is decisive - request was for a
stale handle */
resolve->op_ret = -1;
- resolve->op_errno = ESTALE;
+ resolve->op_errno = ENOENT;
ret = -1;
goto out;
}
@@ -403,7 +403,7 @@ resolve_inode_simple (call_frame_t *frame)
if (inode->ino != 1 && inode->generation != resolve->gen) {
resolve->op_ret = -1;
- resolve->op_errno = ESTALE;
+ resolve->op_errno = ENOENT;
ret = -1;
goto out;
}
@@ -574,15 +574,20 @@ int
resolve_and_resume (call_frame_t *frame, server_resume_fn_t fn)
{
server_state_t *state = NULL;
+ xlator_t *this = NULL;
state = CALL_STATE (frame);
state->resume_fn = fn;
+ this = frame->this;
+
gf_log (BOUND_XL (frame)->name, GF_LOG_DEBUG,
"RESOLVE %s() on %s %s",
gf_fop_list[frame->root->op],
state->resolve.path, state->resolve2.path);
+ print_server_state (frame, state, this, 1);
+
server_resolve_all (frame);
return 0;
generated by cgit (git 2.34.1) at 2024-11-16 19:20:17 +0000