projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: relayd send_command() util not logging on failure
[lttng-tools.git]
/
src
/
common
/
relayd
/
relayd.c
diff --git
a/src/common/relayd/relayd.c
b/src/common/relayd/relayd.c
index 2adcbe415c63f16a176dba9167c247f34eb0eba3..b936a4d3e7798e35e90983b6e20692d2b291bfc8 100644
(file)
--- a/
src/common/relayd/relayd.c
+++ b/
src/common/relayd/relayd.c
@@
-72,14
+72,14
@@
static int send_command(struct lttcomm_relayd_sock *rsock,
memcpy(buf + sizeof(header), data, size);
}
memcpy(buf + sizeof(header), data, size);
}
+ DBG3("Relayd sending command %d of size %" PRIu64, (int) cmd, buf_size);
ret = rsock->sock.ops->sendmsg(&rsock->sock, buf, buf_size, flags);
if (ret < 0) {
ret = rsock->sock.ops->sendmsg(&rsock->sock, buf, buf_size, flags);
if (ret < 0) {
+ PERROR("Failed to send command %d of size %" PRIu64,
+ (int) cmd, buf_size);
ret = -errno;
goto error;
}
ret = -errno;
goto error;
}
-
- DBG3("Relayd sending command %d of size %" PRIu64, cmd, buf_size);
-
error:
free(buf);
alloc_error:
error:
free(buf);
alloc_error:
@@
-378,7
+378,8
@@
end:
* If major versions are compatible, we assign minor_to_use to the
* minor version of the procotol we are going to use for this session.
*
* If major versions are compatible, we assign minor_to_use to the
* minor version of the procotol we are going to use for this session.
*
- * Return 0 if compatible else negative value.
+ * Return 0 if the two daemons are compatible, LTTNG_ERR_RELAYD_VERSION_FAIL
+ * otherwise, or a negative value on network errors.
*/
int relayd_version_check(struct lttcomm_relayd_sock *rsock)
{
*/
int relayd_version_check(struct lttcomm_relayd_sock *rsock)
{
@@
-420,7
+421,7
@@
int relayd_version_check(struct lttcomm_relayd_sock *rsock)
*/
if (msg.major != rsock->major) {
/* Not compatible */
*/
if (msg.major != rsock->major) {
/* Not compatible */
- ret =
-1
;
+ ret =
LTTNG_ERR_RELAYD_VERSION_FAIL
;
DBG2("Relayd version is NOT compatible. Relayd version %u != %u (us)",
msg.major, rsock->major);
goto error;
DBG2("Relayd version is NOT compatible. Relayd version %u != %u (us)",
msg.major, rsock->major);
goto error;
This page took
0.024197 seconds
and
4
git commands to generate.