The branch, master has been updated
via 65442e1 ctdb-client: Fix CID 1419820
via adde930 ctdb-tools: Drop duplicate output from dbstatistics
from e583a92 python: Port tests of samba.messaging to Python 3
compatible form.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 65442e171454e62b6cf4a562c4113735213630d4
Author: Amitay Isaacs <[email protected]>
Date: Wed Oct 18 16:16:27 2017 +1100
ctdb-client: Fix CID 1419820
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Mon Oct 23 19:45:08 CEST 2017 on sn-devel-144
commit adde9307954b2d9726f4be6a7398d6cfa7b2278f
Author: Amitay Isaacs <[email protected]>
Date: Fri Oct 13 12:57:08 2017 +1100
ctdb-tools: Drop duplicate output from dbstatistics
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/client/client_tunnel.c | 4 ++--
ctdb/tools/ctdb.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/client/client_tunnel.c b/ctdb/client/client_tunnel.c
index 11715b4..17b6546 100644
--- a/ctdb/client/client_tunnel.c
+++ b/ctdb/client/client_tunnel.c
@@ -155,7 +155,7 @@ static void ctdb_tunnel_handler(uint64_t tunnel_id,
TDB_DATA data,
return;
}
- if (data.dsize != sizeof(tunnel_data)) {
+ if (data.dsize != sizeof(struct ctdb_tunnel_data)) {
return;
}
@@ -362,7 +362,7 @@ void ctdb_client_req_tunnel(struct ctdb_client_context
*client,
} else if (tunnel->flags & CTDB_TUNNEL_FLAG_REQUEST) {
TDB_DATA data = {
- .dsize = sizeof(&tunnel_data),
+ .dsize = sizeof(struct ctdb_tunnel_data),
.dptr = (uint8_t *)&tunnel_data,
};
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 8d7adb5..2cb46b0 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -5588,7 +5588,6 @@ const struct {
DBSTATISTICS_FIELD(locks.num_current),
DBSTATISTICS_FIELD(locks.num_pending),
DBSTATISTICS_FIELD(locks.num_failed),
- DBSTATISTICS_FIELD(db_ro_delegations),
};
static void print_dbstatistics(const char *db_name,
--
Samba Shared Repository
