diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2017-04-21 17:55:11 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2017-05-24 17:03:28 +0200 |
| commit | 305795a3231fef3af8b38d92252c44fe4a9fa9d1 (patch) | |
| tree | 4c06ce19ead9cdb5b49ea578c5ee8da2f0ca7cb0 /ctdb/include | |
| parent | 9ec302bfad6abcbb1d6dfc759fa607757360ba66 (diff) | |
| download | samba-305795a3231fef3af8b38d92252c44fe4a9fa9d1.tar.gz | |
ctdb-daemon: Do not allow mixed ctdb versions in a cluster
Extend CTDB_REQ_KEEPALIVE packet to include version and uptime. If CTDB
versions do not match shutdown ctdb.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/include')
| -rw-r--r-- | ctdb/include/ctdb_private.h | 3 | ||||
| -rw-r--r-- | ctdb/include/ctdb_protocol.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 7d16c425881..6c7dd7941b7 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -634,6 +634,9 @@ bool ctdb_db_all_frozen(struct ctdb_context *ctdb); void ctdb_start_keepalive(struct ctdb_context *ctdb); void ctdb_stop_keepalive(struct ctdb_context *ctdb); +void ctdb_request_keepalive(struct ctdb_context *ctdb, + struct ctdb_req_header *hdr); + /* from server/ctdb_lock.c */ struct lock_request; diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 2fb3b6d0dca..52ecc456947 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -130,6 +130,8 @@ struct ctdb_reply_control_old { struct ctdb_req_keepalive_old { struct ctdb_req_header hdr; + uint32_t version; + uint32_t uptime; }; /* |