The branch, master has been updated
via 23932d3 ctdb-build: Add ctdb/ directory to include path for
top-level build
via 38d9278 ctdb-include: Use new protocol definitions
via 8b84a82 ctdb-protocol: Rename G_LOCK_READ/WRITE to
CTDB_G_LOCK_READ/WRITE
via b8b737c ctdb-client: Rename g_lock datatypes as per new protocol.h
via 03c69d8 ctdb-include: Remove unused definitions
via 3b71d05 ctdb-tools: Use replace headers instead of system headers
via 409c92b ctdb-daemon: Remove explicit include of ctdb_protocol.h
via 44e611d ctdb-daemon: Rename struct ctdb_control_get_ifaces to
ctdb_iface_list_old
via ecfaef5 ctdb-daemon: Rename struct ctdb_control_public_ip_info to
ctdb_public_ip_info_old
via c4e9d61 ctdb-daemon: Rename struct ctdb_control_iface_info to
ctdb_iface
via 417077c ctdb-daemon: Rename struct ctdb_control_transdb to
ctdb_transdb
via 1278a5a ctdb-daemon: Rename struct ctdb_control_set_tunable to
ctdb_tunable_old
via 64d8bb6 ctdb-daemon: Rename struct ctdb_control_pulldb to
ctdb_pulldb
via f8c2dc3 ctdb-daemon: Rename struct ctdb_control_gratious_arp to
ctdb_addr_info_old
via 357bc60 ctdb-daemon: Rename struct ctdb_control_ip_iface to
ctdb_addr_info_old
via cb0be41 ctdb-daemon: Rename struct ctdb_tunable to ctdb_tunable_list
via ca48135 ctdb-daemon: Rename struct ctdb_control_tcp_tickle_list to
ctdb_tickle_list_old
via e34afd8 ctdb-daemon: Rename struct srvid_request_data to
ctdb_disable_message
via cf1ac77 ctdb-daemon: Rename struct srvid_request to
ctdb_srvid_message
via d4de452 ctdb-daemon: Rename struct ctdb_ban_time to ctdb_ban_state
via 92a6ac1 ctdb-daemon: Rename struct ctdb_tcp_connection to
ctdb_connection
via a82ee23 ctdb-daemon: Rename struct ctdb_control_tcp_addr to
ctdb_connection
via 699ee0d ctdb-daemon: Rename struct ctdb_server_id_list to
ctdb_client_id_list_old
via d858c21 ctdb-daemon: Rename struct ctdb_server_id to ctdb_client_id
via 22c84ff ctdb-daemon: Rename enum ctdb_server_id_type to
ctdb_client_id_type
via 645cd43 ctdb-daemon: Rename struct ctdb_dbid_map to
ctdb_dbid_map_old
via 563f518 ctdb-daemon: Remove struct ctdb_client_notify_deregister
via b936145 ctdb-daemon: Rename struct ctdb_client_notify_register to
ctdb_notify_data_old
via 6e37bb7 ctdb-include: Remove unused structure definitions
via a9f335fc ctdb-daemon: Rename struct ctdb_iface to ctdb_interface
via 75572bd ctdb-daemon: Rename struct ctdb_db_statistics to
ctdb_db_statistics_old
via b45bc4c ctdb-daemon: Rename struct ctdb_statistics_wire to
ctdb_statistics_list_old
via b99436e ctdb-daemon: Rename struct ctdb_rec_data to
ctdb_rec_data_old
via 9bf7d0d ctdb-daemon: Rename struct latency_counter to
ctdb_latency_counter
via 04eaa07 ctdb-daemon: Rename struct ctdb_all_public_ips to
ctdb_public_ip_list_old
via 2b76e58 ctdb-daemon: Rename struct ctdb_public_ip_list to
public_ip_list
via afc5d8a ctdb-daemon: Rename struct ctdb_node_map to
ctdb_node_map_old
via c43b381 ctdb-include: Remove unnecessary typedefs
via e8f8c63 ctdb-daemon: Rename struct ctdb_req_keepalive to
ctdb_req_keepalive_old
via 1c828b4 ctdb-daemon: Rename struct ctdb_reply_control to
ctdb_reply_control_old
via e1fed53 ctdb-daemon: Rename struct ctdb_req_control to
ctdb_req_control_old
via acf858d ctdb-daemon: Rename struct ctdb_req_message to
ctdb_req_message_old
via 296d9f4 ctdb-daemon: Rename struct ctdb_reply_dmaster to
ctdb_reply_dmaster_old
via 555a2f3 ctdb-daemon: Rename struct ctdb_req_dmaster to
ctdb_req_dmaster_old
via e23a289 ctdb-daemon: Rename struct ctdb_reply_error to
ctdb_reply_error_old
via 277c21f ctdb-daemon: Rename struct ctdb_reply_call to
ctdb_reply_call_old
via e0c42c5 ctdb-daemon: Rename struct ctdb_req_call to
ctdb_req_call_old
via f55889d ctdb-daemon: Rename enum ctdb_eventscript_call to ctdb_event
via e7c9e50 ctdb-daemon: Rename struct ctdb_scripts_wire to
ctdb_script_list_old
via b9b4bfa ctdb-daemon: Rename struct ctdb_script_wire to ctdb_script
from 18879da Changing log level of two entries to DBG_NOTICE
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 23932d38dd2c83460a34030dcbad2d70a5e0157d
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 18:28:29 2015 +1100
ctdb-build: Add ctdb/ directory to include path for top-level build
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
Autobuild-User(master): Martin Schwenke <mart...@samba.org>
Autobuild-Date(master): Wed Nov 4 03:52:27 CET 2015 on sn-devel-104
commit 38d92788d621745213e38986834b9ee0b2fdfb55
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 17:51:52 2015 +1100
ctdb-include: Use new protocol definitions
This gets rid of the duplicate definitions from ctdb_protocol.h.
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 8b84a82eab2af34a29533d9bced347f672f02c0b
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 18:37:42 2015 +1100
ctdb-protocol: Rename G_LOCK_READ/WRITE to CTDB_G_LOCK_READ/WRITE
to avoid clash with definitions from source3/include/g_lock.h.
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit b8b737c77ac3240d63afa441aeba195a915c2353
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 17:55:35 2015 +1100
ctdb-client: Rename g_lock datatypes as per new protocol.h
struct server_id => ctdb_server_id
enum g_lock_type => ctdb_g_lock_type
struct g_lock_rec => ctdb_g_lock
struct g_lock_recs => ctdb_g_lock_list
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 03c69d8400f6a50f614ab2800c1988b90f4ba60a
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 17:36:23 2015 +1100
ctdb-include: Remove unused definitions
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 3b71d0592752295e6f1f642cb647ca965e2abfe9
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 19:52:02 2015 +1100
ctdb-tools: Use replace headers instead of system headers
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 409c92b6c6dc54a072743dc2bb6bcaa533cc5110
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 19:52:53 2015 +1100
ctdb-daemon: Remove explicit include of ctdb_protocol.h
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 44e611ddcf8b929cbee48bc83b066d88174bf121
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 19:43:48 2015 +1100
ctdb-daemon: Rename struct ctdb_control_get_ifaces to ctdb_iface_list_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit ecfaef503191ab45317cc6a851201ec992d7fb11
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 19:39:51 2015 +1100
ctdb-daemon: Rename struct ctdb_control_public_ip_info to
ctdb_public_ip_info_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit c4e9d616ae4c87aecbd98a3c4387742bbf44a2e7
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 19:37:17 2015 +1100
ctdb-daemon: Rename struct ctdb_control_iface_info to ctdb_iface
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 417077c8a722b628d4db17f0f1799c70639d5d17
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 19:22:23 2015 +1100
ctdb-daemon: Rename struct ctdb_control_transdb to ctdb_transdb
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 1278a5a4ed527f3fe0f7150854d53b40835121ad
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 19:18:02 2015 +1100
ctdb-daemon: Rename struct ctdb_control_set_tunable to ctdb_tunable_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 64d8bb626bd17910628efe80835912299ec7c6a9
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 19:10:53 2015 +1100
ctdb-daemon: Rename struct ctdb_control_pulldb to ctdb_pulldb
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit f8c2dc32206ed5e6244f9a9dc3e9dbdd24f7e194
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 14:47:54 2015 +1100
ctdb-daemon: Rename struct ctdb_control_gratious_arp to ctdb_addr_info_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 357bc609472902d10ea8324bd9892b1bab889379
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 14:46:21 2015 +1100
ctdb-daemon: Rename struct ctdb_control_ip_iface to ctdb_addr_info_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit cb0be4126ff7b8db94b34f2b115db35cddbf137e
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 18:51:22 2015 +1100
ctdb-daemon: Rename struct ctdb_tunable to ctdb_tunable_list
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit ca481354c0edcb2afb022ee088010334826fd783
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 18:44:19 2015 +1100
ctdb-daemon: Rename struct ctdb_control_tcp_tickle_list to
ctdb_tickle_list_old
Also remove unnecessary struct ctdb_tcp_wire_array.
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit e34afd85161d462ee67ff5baa0ce1016c8b74438
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 18:23:13 2015 +1100
ctdb-daemon: Rename struct srvid_request_data to ctdb_disable_message
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit cf1ac77b3a96f2d9214e132a5a18966d31322880
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 14:32:49 2015 +1100
ctdb-daemon: Rename struct srvid_request to ctdb_srvid_message
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit d4de4527b070ab0039ffdf7d2fdd3a105c198b5d
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 18:18:33 2015 +1100
ctdb-daemon: Rename struct ctdb_ban_time to ctdb_ban_state
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 92a6ac18ae943c09ebcde7ea2879c7347bc59512
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 18:14:21 2015 +1100
ctdb-daemon: Rename struct ctdb_tcp_connection to ctdb_connection
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit a82ee238b5ade4315baa9835744dac8f5362bdf8
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 14:25:34 2015 +1100
ctdb-daemon: Rename struct ctdb_control_tcp_addr to ctdb_connection
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 699ee0df94dda5a4f2fe97efe3fd03f9a15f7b75
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 14:16:45 2015 +1100
ctdb-daemon: Rename struct ctdb_server_id_list to ctdb_client_id_list_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit d858c210a7d7498e539a9d76ece1a6b162e64c10
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 17:47:03 2015 +1100
ctdb-daemon: Rename struct ctdb_server_id to ctdb_client_id
This is to avoid clash with samba structure server_id.
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 22c84ff746eebb205d98014f5e4c3cf5b0438673
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 14:12:11 2015 +1100
ctdb-daemon: Rename enum ctdb_server_id_type to ctdb_client_id_type
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 645cd43200f16403baec61ec4829770ce50ed70f
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 17:46:05 2015 +1100
ctdb-daemon: Rename struct ctdb_dbid_map to ctdb_dbid_map_old
Match struct ctdb_dbid as per protocol/protocol.h
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 563f51828367499cca0dad986f78a996a9b11e0b
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 17:47:03 2015 +1100
ctdb-daemon: Remove struct ctdb_client_notify_deregister
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit b93614595186db2d9c33dc58d6736e4978d9664b
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 17:43:20 2015 +1100
ctdb-daemon: Rename struct ctdb_client_notify_register to
ctdb_notify_data_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 6e37bb7c3a6231ffd47d9821819add84c69d35b4
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 17:36:14 2015 +1100
ctdb-include: Remove unused structure definitions
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit a9f335fcc2af906770212abaedfceb30a81ad409
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 17:34:24 2015 +1100
ctdb-daemon: Rename struct ctdb_iface to ctdb_interface
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 75572bd2a3e85114e83cbb16cad56cbf29da124d
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 17:33:09 2015 +1100
ctdb-daemon: Rename struct ctdb_db_statistics to ctdb_db_statistics_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit b45bc4ce4bd521380c08bcf2f934f3e98be4d292
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 20:09:40 2015 +1100
ctdb-daemon: Rename struct ctdb_statistics_wire to ctdb_statistics_list_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit b99436e425ec8574f88f6ef778be4e06013f01ae
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 17:30:30 2015 +1100
ctdb-daemon: Rename struct ctdb_rec_data to ctdb_rec_data_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 9bf7d0dc447bd43c5a977bd3da5ccda258be8b00
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 17:18:24 2015 +1100
ctdb-daemon: Rename struct latency_counter to ctdb_latency_counter
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 04eaa077aac4c82c334c01fea730de97220c8c1e
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 17:16:24 2015 +1100
ctdb-daemon: Rename struct ctdb_all_public_ips to ctdb_public_ip_list_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 2b76e580321d050bf17d4999ee288c86669d6401
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 17:10:54 2015 +1100
ctdb-daemon: Rename struct ctdb_public_ip_list to public_ip_list
A private structure need not have ctdb_ prefix.
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit afc5d8a4420c7c235ab54f938a3f3a77d4309665
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 17:22:48 2015 +1100
ctdb-daemon: Rename struct ctdb_node_map to ctdb_node_map_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit c43b381b71140913a59471d8000e3b2c804bf3f4
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 16:58:02 2015 +1100
ctdb-include: Remove unnecessary typedefs
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit e8f8c633610469d631782deaa6ef0eabae735b20
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 16:45:41 2015 +1100
ctdb-daemon: Rename struct ctdb_req_keepalive to ctdb_req_keepalive_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 1c828b4ed6127e0022f4512f65a4b8c1280aa36a
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 16:44:08 2015 +1100
ctdb-daemon: Rename struct ctdb_reply_control to ctdb_reply_control_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit e1fed53e2abafcae8a5da9a3b24ee8db38b97441
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 16:42:05 2015 +1100
ctdb-daemon: Rename struct ctdb_req_control to ctdb_req_control_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit acf858defbe8672c91265e6e2afe45476ef0fba6
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 16:36:30 2015 +1100
ctdb-daemon: Rename struct ctdb_req_message to ctdb_req_message_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 296d9f4cdafdf5770c64f9f75effd250b1f9972e
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 16:34:01 2015 +1100
ctdb-daemon: Rename struct ctdb_reply_dmaster to ctdb_reply_dmaster_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 555a2f3f4f6ee5fca6d741a987b88b42f5504c06
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 16:32:09 2015 +1100
ctdb-daemon: Rename struct ctdb_req_dmaster to ctdb_req_dmaster_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit e23a2891d90b040c41d8c8dc1cf18e76d501aaab
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 16:30:31 2015 +1100
ctdb-daemon: Rename struct ctdb_reply_error to ctdb_reply_error_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit 277c21f0cd86510c421642eae9267c6fae44df78
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 16:29:01 2015 +1100
ctdb-daemon: Rename struct ctdb_reply_call to ctdb_reply_call_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit e0c42c5698f32ea6a3ec8aa93c380969bd110117
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Oct 29 16:26:29 2015 +1100
ctdb-daemon: Rename struct ctdb_req_call to ctdb_req_call_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit f55889d2c9630e088ae9b8058d29f9df6fb2a007
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 16:54:10 2015 +1100
ctdb-daemon: Rename enum ctdb_eventscript_call to ctdb_event
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit e7c9e509168c3f26e83fb2083ee9bc4eb9841480
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 20:02:45 2015 +1100
ctdb-daemon: Rename struct ctdb_scripts_wire to ctdb_script_list_old
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
commit b9b4bfa33070a9c89e5466e5d1883b89aab06e14
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Oct 28 16:49:47 2015 +1100
ctdb-daemon: Rename struct ctdb_script_wire to ctdb_script
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
-----------------------------------------------------------------------
Summary of changes:
ctdb/client/client_db.c | 4 +-
ctdb/client/ctdb_client.c | 300 ++++++-------
ctdb/common/common.h | 30 +-
ctdb/common/ctdb_io.c | 4 +-
ctdb/common/ctdb_util.c | 53 +--
ctdb/include/ctdb_client.h | 56 +--
ctdb/include/ctdb_private.h | 72 +--
ctdb/include/ctdb_protocol.h | 830 ++---------------------------------
ctdb/protocol/protocol.h | 4 +-
ctdb/server/ctdb_banning.c | 16 +-
ctdb/server/ctdb_call.c | 58 +--
ctdb/server/ctdb_control.c | 52 +--
ctdb/server/ctdb_daemon.c | 62 +--
ctdb/server/ctdb_freeze.c | 28 +-
ctdb/server/ctdb_lock.c | 1 -
ctdb/server/ctdb_ltdb_server.c | 12 +-
ctdb/server/ctdb_monitor.c | 2 +-
ctdb/server/ctdb_persistent.c | 8 +-
ctdb/server/ctdb_recover.c | 46 +-
ctdb/server/ctdb_recoverd.c | 188 ++++----
ctdb/server/ctdb_server.c | 4 +-
ctdb/server/ctdb_serverids.c | 27 +-
ctdb/server/ctdb_statistics.c | 7 +-
ctdb/server/ctdb_takeover.c | 433 +++++++++---------
ctdb/server/ctdb_traverse.c | 25 +-
ctdb/server/ctdb_tunables.c | 122 ++---
ctdb/server/ctdb_update_record.c | 6 +-
ctdb/server/ctdb_vacuum.c | 14 +-
ctdb/server/ctdbd.c | 2 +-
ctdb/server/eventscript.c | 52 +--
ctdb/tests/src/ctdb_bench.c | 2 +-
ctdb/tests/src/ctdb_takeover_tests.c | 67 +--
ctdb/tests/src/ctdb_test.c | 8 +-
ctdb/tests/src/ctdb_test_stubs.c | 36 +-
ctdb/tools/ctdb.c | 278 ++++++------
ctdb/tools/ltdbtool.c | 21 +-
ctdb/utils/pmda/pmda_ctdb.c | 1 -
ctdb/wscript | 2 +-
source3/include/ctdbd_conn.h | 2 +-
source3/lib/ctdbd_conn.c | 82 ++--
source3/lib/dbwrap/dbwrap_ctdb.c | 24 +-
41 files changed, 1116 insertions(+), 1925 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/client/client_db.c b/ctdb/client/client_db.c
index 97ec1f4..146c5e1 100644
--- a/ctdb/client/client_db.c
+++ b/ctdb/client/client_db.c
@@ -1090,7 +1090,7 @@ static void ctdb_g_lock_lock_retry(struct tevent_req
*subreq);
static bool ctdb_g_lock_conflicts(enum ctdb_g_lock_type l1,
enum ctdb_g_lock_type l2)
{
- if ((l1 == G_LOCK_READ) && (l2 == G_LOCK_READ)) {
+ if ((l1 == CTDB_G_LOCK_READ) && (l2 == CTDB_G_LOCK_READ)) {
return false;
}
return true;
@@ -1119,7 +1119,7 @@ struct tevent_req *ctdb_g_lock_lock_send(TALLOC_CTX
*mem_ctx,
state->key.dptr = discard_const(keyname);
state->key.dsize = strlen(keyname) + 1;
state->my_sid = *sid;
- state->lock_type = (readonly ? G_LOCK_READ : G_LOCK_WRITE);
+ state->lock_type = (readonly ? CTDB_G_LOCK_READ : CTDB_G_LOCK_WRITE);
subreq = ctdb_fetch_lock_send(state, ev, client, db, state->key,
false);
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 28f4358..765f4f6 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -164,7 +164,7 @@ static int ctdb_client_queue_pkt(struct ctdb_context *ctdb,
struct ctdb_req_head
*/
static void ctdb_client_reply_call(struct ctdb_context *ctdb, struct
ctdb_req_header *hdr)
{
- struct ctdb_reply_call *c = (struct ctdb_reply_call *)hdr;
+ struct ctdb_reply_call_old *c = (struct ctdb_reply_call_old *)hdr;
struct ctdb_client_call_state *state;
state = reqid_find(ctdb->idr, hdr->reqid, struct
ctdb_client_call_state);
@@ -195,7 +195,7 @@ static void ctdb_client_reply_call(struct ctdb_context
*ctdb, struct ctdb_req_he
void ctdb_request_message(struct ctdb_context *ctdb,
struct ctdb_req_header *hdr)
{
- struct ctdb_req_message *c = (struct ctdb_req_message *)hdr;
+ struct ctdb_req_message_old *c = (struct ctdb_req_message_old *)hdr;
TDB_DATA data;
data.dsize = c->datalen;
@@ -411,7 +411,7 @@ struct ctdb_client_call_state *ctdb_call_send(struct
ctdb_db_context *ctdb_db,
TDB_DATA data;
int ret;
size_t len;
- struct ctdb_req_call *c;
+ struct ctdb_req_call_old *c;
/* if the domain socket is not yet open, open it */
if (ctdb->daemon.sd==-1) {
@@ -451,8 +451,8 @@ struct ctdb_client_call_state *ctdb_call_send(struct
ctdb_db_context *ctdb_db,
return NULL;
}
- len = offsetof(struct ctdb_req_call, data) + call->key.dsize +
call->call_data.dsize;
- c = ctdbd_allocate_pkt(ctdb, state, CTDB_REQ_CALL, len, struct
ctdb_req_call);
+ len = offsetof(struct ctdb_req_call_old, data) + call->key.dsize +
call->call_data.dsize;
+ c = ctdbd_allocate_pkt(ctdb, state, CTDB_REQ_CALL, len, struct
ctdb_req_call_old);
if (c == NULL) {
DEBUG(DEBUG_ERR, (__location__ " failed to allocate packet\n"));
return NULL;
@@ -589,12 +589,12 @@ int ctdb_client_check_message_handlers(struct
ctdb_context *ctdb, uint64_t *ids,
int ctdb_client_send_message(struct ctdb_context *ctdb, uint32_t pnn,
uint64_t srvid, TDB_DATA data)
{
- struct ctdb_req_message *r;
+ struct ctdb_req_message_old *r;
int len, res;
- len = offsetof(struct ctdb_req_message, data) + data.dsize;
+ len = offsetof(struct ctdb_req_message_old, data) + data.dsize;
r = ctdbd_allocate_pkt(ctdb, ctdb, CTDB_REQ_MESSAGE,
- len, struct ctdb_req_message);
+ len, struct ctdb_req_message_old);
CTDB_NO_MEMORY(ctdb, r);
r->hdr.destnode = pnn;
@@ -990,7 +990,7 @@ static void invoke_control_callback(struct tevent_context
*ev,
static void ctdb_client_reply_control(struct ctdb_context *ctdb,
struct ctdb_req_header *hdr)
{
- struct ctdb_reply_control *c = (struct ctdb_reply_control *)hdr;
+ struct ctdb_reply_control_old *c = (struct ctdb_reply_control_old *)hdr;
struct ctdb_client_control_state *state;
state = reqid_find(ctdb->idr, hdr->reqid, struct
ctdb_client_control_state);
@@ -1073,7 +1073,7 @@ struct ctdb_client_control_state
*ctdb_control_send(struct ctdb_context *ctdb,
{
struct ctdb_client_control_state *state;
size_t len;
- struct ctdb_req_control *c;
+ struct ctdb_req_control_old *c;
int ret;
if (errormsg) {
@@ -1095,9 +1095,9 @@ struct ctdb_client_control_state
*ctdb_control_send(struct ctdb_context *ctdb,
talloc_set_destructor(state, ctdb_client_control_destructor);
- len = offsetof(struct ctdb_req_control, data) + data.dsize;
+ len = offsetof(struct ctdb_req_control_old, data) + data.dsize;
c = ctdbd_allocate_pkt(ctdb, state, CTDB_REQ_CONTROL,
- len, struct ctdb_req_control);
+ len, struct ctdb_req_control_old);
state->c = c;
CTDB_NO_MEMORY_NULL(ctdb, c);
c->hdr.reqid = state->reqid;
@@ -1292,12 +1292,12 @@ int ctdb_ctrl_statistics(struct ctdb_context *ctdb,
uint32_t destnode, struct ct
* get db statistics
*/
int ctdb_ctrl_dbstatistics(struct ctdb_context *ctdb, uint32_t destnode,
uint32_t dbid,
- TALLOC_CTX *mem_ctx, struct ctdb_db_statistics
**dbstat)
+ TALLOC_CTX *mem_ctx, struct ctdb_db_statistics_old
**dbstat)
{
int ret;
TDB_DATA indata, outdata;
int32_t res;
- struct ctdb_db_statistics *wire, *s;
+ struct ctdb_db_statistics_old *wire, *s;
char *ptr;
int i;
@@ -1311,21 +1311,21 @@ int ctdb_ctrl_dbstatistics(struct ctdb_context *ctdb,
uint32_t destnode, uint32_
return -1;
}
- if (outdata.dsize < offsetof(struct ctdb_db_statistics, hot_keys_wire))
{
+ if (outdata.dsize < offsetof(struct ctdb_db_statistics_old,
hot_keys_wire)) {
DEBUG(DEBUG_ERR,(__location__ " Wrong dbstatistics size %zi -
expected >= %lu\n",
outdata.dsize,
(long unsigned int)sizeof(struct
ctdb_statistics)));
return -1;
}
- s = talloc_zero(mem_ctx, struct ctdb_db_statistics);
+ s = talloc_zero(mem_ctx, struct ctdb_db_statistics_old);
if (s == NULL) {
talloc_free(outdata.dptr);
CTDB_NO_MEMORY(ctdb, s);
}
- wire = (struct ctdb_db_statistics *)outdata.dptr;
- memcpy(s, wire, offsetof(struct ctdb_db_statistics, hot_keys_wire));
+ wire = (struct ctdb_db_statistics_old *)outdata.dptr;
+ memcpy(s, wire, offsetof(struct ctdb_db_statistics_old, hot_keys_wire));
ptr = &wire->hot_keys_wire[0];
for (i=0; i<wire->num_hot_keys; i++) {
s->hot_keys[i].key.dptr = talloc_size(mem_ctx,
s->hot_keys[i].key.dsize);
@@ -1533,7 +1533,7 @@ int ctdb_ctrl_setrecmaster(struct ctdb_context *ctdb,
struct timeval timeout, ui
get a list of databases off a remote node
*/
int ctdb_ctrl_getdbmap(struct ctdb_context *ctdb, struct timeval timeout,
uint32_t destnode,
- TALLOC_CTX *mem_ctx, struct ctdb_dbid_map **dbmap)
+ TALLOC_CTX *mem_ctx, struct ctdb_dbid_map_old **dbmap)
{
int ret;
TDB_DATA outdata;
@@ -1547,7 +1547,7 @@ int ctdb_ctrl_getdbmap(struct ctdb_context *ctdb, struct
timeval timeout, uint32
return -1;
}
- *dbmap = (struct ctdb_dbid_map *)talloc_memdup(mem_ctx, outdata.dptr,
outdata.dsize);
+ *dbmap = (struct ctdb_dbid_map_old *)talloc_memdup(mem_ctx,
outdata.dptr, outdata.dsize);
talloc_free(outdata.dptr);
return 0;
@@ -1558,7 +1558,7 @@ int ctdb_ctrl_getdbmap(struct ctdb_context *ctdb, struct
timeval timeout, uint32
*/
int ctdb_ctrl_getnodemap(struct ctdb_context *ctdb,
struct timeval timeout, uint32_t destnode,
- TALLOC_CTX *mem_ctx, struct ctdb_node_map **nodemap)
+ TALLOC_CTX *mem_ctx, struct ctdb_node_map_old **nodemap)
{
int ret;
TDB_DATA outdata;
@@ -1572,7 +1572,7 @@ int ctdb_ctrl_getnodemap(struct ctdb_context *ctdb,
return -1;
}
- *nodemap = (struct ctdb_node_map *)talloc_memdup(mem_ctx, outdata.dptr,
outdata.dsize);
+ *nodemap = (struct ctdb_node_map_old *)talloc_memdup(mem_ctx,
outdata.dptr, outdata.dsize);
talloc_free(outdata.dptr);
return 0;
}
@@ -1582,7 +1582,7 @@ int ctdb_ctrl_getnodemap(struct ctdb_context *ctdb,
*/
int ctdb_ctrl_getnodesfile(struct ctdb_context *ctdb,
struct timeval timeout, uint32_t destnode,
- TALLOC_CTX *mem_ctx, struct ctdb_node_map **nodemap)
+ TALLOC_CTX *mem_ctx, struct ctdb_node_map_old
**nodemap)
{
int ret;
TDB_DATA outdata;
@@ -1596,7 +1596,7 @@ int ctdb_ctrl_getnodesfile(struct ctdb_context *ctdb,
return -1;
}
- *nodemap = (struct ctdb_node_map *)talloc_memdup(mem_ctx, outdata.dptr,
outdata.dsize);
+ *nodemap = (struct ctdb_node_map_old *)talloc_memdup(mem_ctx,
outdata.dptr, outdata.dsize);
talloc_free(outdata.dptr);
return 0;
@@ -1668,16 +1668,16 @@ struct ctdb_client_control_state *ctdb_ctrl_pulldb_send(
uint32_t lmaster, TALLOC_CTX *mem_ctx, struct timeval timeout)
{
TDB_DATA indata;
- struct ctdb_control_pulldb *pull;
+ struct ctdb_pulldb *pull;
struct ctdb_client_control_state *state;
- pull = talloc(mem_ctx, struct ctdb_control_pulldb);
+ pull = talloc(mem_ctx, struct ctdb_pulldb);
CTDB_NO_MEMORY_NULL(ctdb, pull);
pull->db_id = dbid;
pull->lmaster = lmaster;
- indata.dsize = sizeof(struct ctdb_control_pulldb);
+ indata.dsize = sizeof(struct ctdb_pulldb);
indata.dptr = (unsigned char *)pull;
state = ctdb_control_send(ctdb, destnode, 0,
@@ -2020,7 +2020,7 @@ uint32_t *ctdb_get_connected_nodes(struct ctdb_context
*ctdb,
TALLOC_CTX *mem_ctx,
uint32_t *num_nodes)
{
- struct ctdb_node_map *map=NULL;
+ struct ctdb_node_map_old *map=NULL;
int ret, i;
uint32_t *nodes;
@@ -2227,7 +2227,7 @@ struct traverse_state {
static void traverse_handler(uint64_t srvid, TDB_DATA data, void *p)
{
struct traverse_state *state = (struct traverse_state *)p;
- struct ctdb_rec_data *d = (struct ctdb_rec_data *)data.dptr;
+ struct ctdb_rec_data_old *d = (struct ctdb_rec_data_old *)data.dptr;
TDB_DATA key;
if (data.dsize < sizeof(uint32_t) || d->length != data.dsize) {
@@ -2693,16 +2693,16 @@ int ctdb_ctrl_set_tunable(struct ctdb_context *ctdb,
uint32_t destnode,
const char *name, uint32_t value)
{
- struct ctdb_control_set_tunable *t;
+ struct ctdb_tunable_old *t;
TDB_DATA data;
int32_t res;
int ret;
- data.dsize = offsetof(struct ctdb_control_set_tunable, name) +
strlen(name) + 1;
+ data.dsize = offsetof(struct ctdb_tunable_old, name) + strlen(name) + 1;
data.dptr = talloc_size(ctdb, data.dsize);
CTDB_NO_MEMORY(ctdb, data.dptr);
- t = (struct ctdb_control_set_tunable *)data.dptr;
+ t = (struct ctdb_tunable_old *)data.dptr;
t->length = strlen(name)+1;
memcpy(t->name, name, t->length);
t->value = value;
@@ -2774,7 +2774,7 @@ int ctdb_ctrl_get_public_ips_flags(struct ctdb_context
*ctdb,
struct timeval timeout, uint32_t destnode,
TALLOC_CTX *mem_ctx,
uint32_t flags,
- struct ctdb_all_public_ips **ips)
+ struct ctdb_public_ip_list_old **ips)
{
int ret;
TDB_DATA outdata;
@@ -2790,7 +2790,7 @@ int ctdb_ctrl_get_public_ips_flags(struct ctdb_context
*ctdb,
return -1;
}
- *ips = (struct ctdb_all_public_ips *)talloc_memdup(mem_ctx,
outdata.dptr, outdata.dsize);
+ *ips = (struct ctdb_public_ip_list_old *)talloc_memdup(mem_ctx,
outdata.dptr, outdata.dsize);
talloc_free(outdata.dptr);
return 0;
@@ -2799,7 +2799,7 @@ int ctdb_ctrl_get_public_ips_flags(struct ctdb_context
*ctdb,
int ctdb_ctrl_get_public_ips(struct ctdb_context *ctdb,
struct timeval timeout, uint32_t destnode,
TALLOC_CTX *mem_ctx,
- struct ctdb_all_public_ips **ips)
+ struct ctdb_public_ip_list_old **ips)
{
return ctdb_ctrl_get_public_ips_flags(ctdb, timeout,
destnode, mem_ctx,
@@ -2810,13 +2810,13 @@ int ctdb_ctrl_get_public_ip_info(struct ctdb_context
*ctdb,
struct timeval timeout, uint32_t destnode,
TALLOC_CTX *mem_ctx,
const ctdb_sock_addr *addr,
- struct ctdb_control_public_ip_info **_info)
+ struct ctdb_public_ip_info_old **_info)
{
int ret;
TDB_DATA indata;
TDB_DATA outdata;
int32_t res;
- struct ctdb_control_public_ip_info *info;
+ struct ctdb_public_ip_info_old *info;
uint32_t len;
uint32_t i;
@@ -2833,7 +2833,7 @@ int ctdb_ctrl_get_public_ip_info(struct ctdb_context
*ctdb,
return -1;
}
- len = offsetof(struct ctdb_control_public_ip_info, ifaces);
+ len = offsetof(struct ctdb_public_ip_info_old, ifaces);
if (len > outdata.dsize) {
DEBUG(DEBUG_ERR,(__location__ " ctdb_control for get public ip
info "
"returned invalid data with size %u > %u\n",
@@ -2843,8 +2843,8 @@ int ctdb_ctrl_get_public_ip_info(struct ctdb_context
*ctdb,
return -1;
}
- info = (struct ctdb_control_public_ip_info *)outdata.dptr;
- len += info->num*sizeof(struct ctdb_control_iface_info);
+ info = (struct ctdb_public_ip_info_old *)outdata.dptr;
+ len += info->num*sizeof(struct ctdb_iface);
if (len > outdata.dsize) {
DEBUG(DEBUG_ERR,(__location__ " ctdb_control for get public ip
info "
@@ -2860,7 +2860,7 @@ int ctdb_ctrl_get_public_ip_info(struct ctdb_context
*ctdb,
info->ifaces[i].name[CTDB_IFACE_SIZE] = '\0';
}
- *_info = (struct ctdb_control_public_ip_info *)talloc_memdup(mem_ctx,
+ *_info = (struct ctdb_public_ip_info_old *)talloc_memdup(mem_ctx,
outdata.dptr,
outdata.dsize);
talloc_free(outdata.dptr);
@@ -2877,12 +2877,12 @@ int ctdb_ctrl_get_public_ip_info(struct ctdb_context
*ctdb,
int ctdb_ctrl_get_ifaces(struct ctdb_context *ctdb,
struct timeval timeout, uint32_t destnode,
TALLOC_CTX *mem_ctx,
- struct ctdb_control_get_ifaces **_ifaces)
+ struct ctdb_iface_list_old **_ifaces)
{
int ret;
TDB_DATA outdata;
int32_t res;
- struct ctdb_control_get_ifaces *ifaces;
+ struct ctdb_iface_list_old *ifaces;
uint32_t len;
uint32_t i;
@@ -2896,7 +2896,7 @@ int ctdb_ctrl_get_ifaces(struct ctdb_context *ctdb,
return -1;
}
- len = offsetof(struct ctdb_control_get_ifaces, ifaces);
+ len = offsetof(struct ctdb_iface_list_old, ifaces);
if (len > outdata.dsize) {
DEBUG(DEBUG_ERR,(__location__ " ctdb_control for get ifaces "
"returned invalid data with size %u > %u\n",
@@ -2906,8 +2906,8 @@ int ctdb_ctrl_get_ifaces(struct ctdb_context *ctdb,
return -1;
}
- ifaces = (struct ctdb_control_get_ifaces *)outdata.dptr;
- len += ifaces->num*sizeof(struct ctdb_control_iface_info);
+ ifaces = (struct ctdb_iface_list_old *)outdata.dptr;
+ len += ifaces->num*sizeof(struct ctdb_iface);
if (len > outdata.dsize) {
DEBUG(DEBUG_ERR,(__location__ " ctdb_control for get ifaces "
@@ -2923,7 +2923,7 @@ int ctdb_ctrl_get_ifaces(struct ctdb_context *ctdb,
ifaces->ifaces[i].name[CTDB_IFACE_SIZE] = '\0';
}
- *_ifaces = (struct ctdb_control_get_ifaces *)talloc_memdup(mem_ctx,
+ *_ifaces = (struct ctdb_iface_list_old *)talloc_memdup(mem_ctx,
outdata.dptr,
outdata.dsize);
talloc_free(outdata.dptr);
@@ -2940,7 +2940,7 @@ int ctdb_ctrl_get_ifaces(struct ctdb_context *ctdb,
int ctdb_ctrl_set_iface_link(struct ctdb_context *ctdb,
struct timeval timeout, uint32_t destnode,
TALLOC_CTX *mem_ctx,
- const struct ctdb_control_iface_info *info)
+ const struct ctdb_iface *info)
{
int ret;
TDB_DATA indata;
@@ -2970,7 +2970,7 @@ int ctdb_ctrl_modflags(struct ctdb_context *ctdb, struct
timeval timeout, uint32
{
int ret;
TDB_DATA data;
- struct ctdb_node_map *nodemap=NULL;
+ struct ctdb_node_map_old *nodemap=NULL;
struct ctdb_node_flag_change c;
TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
uint32_t recmaster;
@@ -3030,10 +3030,10 @@ int ctdb_ctrl_modflags(struct ctdb_context *ctdb,
struct timeval timeout, uint32
/*
get all tunables
*/
-int ctdb_ctrl_get_all_tunables(struct ctdb_context *ctdb,
- struct timeval timeout,
+int ctdb_ctrl_get_all_tunables(struct ctdb_context *ctdb,
+ struct timeval timeout,
uint32_t destnode,
- struct ctdb_tunable *tunables)
+ struct ctdb_tunable_list *tunables)
{
TDB_DATA outdata;
int ret;
@@ -3049,10 +3049,10 @@ int ctdb_ctrl_get_all_tunables(struct ctdb_context
*ctdb,
if (outdata.dsize != sizeof(*tunables)) {
DEBUG(DEBUG_ERR,(__location__ " bad data size %u in
ctdb_ctrl_get_all_tunables should be %u\n",
(unsigned)outdata.dsize, (unsigned)sizeof(*tunables)));
- return -1;
+ return -1;
}
- *tunables = *(struct ctdb_tunable *)outdata.dptr;
+ *tunables = *(struct ctdb_tunable_list *)outdata.dptr;
talloc_free(outdata.dptr);
return 0;
}
@@ -3060,16 +3060,15 @@ int ctdb_ctrl_get_all_tunables(struct ctdb_context
*ctdb,
/*
add a public address to a node
*/
-int ctdb_ctrl_add_public_ip(struct ctdb_context *ctdb,
- struct timeval timeout,
- uint32_t destnode,
- struct ctdb_control_ip_iface *pub)
+int ctdb_ctrl_add_public_ip(struct ctdb_context *ctdb,
+ struct timeval timeout, uint32_t destnode,
+ struct ctdb_addr_info_old *pub)
{
TDB_DATA data;
int32_t res;
int ret;
- data.dsize = offsetof(struct ctdb_control_ip_iface, iface) + pub->len;
+ data.dsize = offsetof(struct ctdb_addr_info_old, iface) + pub->len;
data.dptr = (unsigned char *)pub;
ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_ADD_PUBLIC_IP, 0,
data, NULL,
@@ -3085,16 +3084,15 @@ int ctdb_ctrl_add_public_ip(struct ctdb_context *ctdb,
/*
delete a public address from a node
*/
-int ctdb_ctrl_del_public_ip(struct ctdb_context *ctdb,
- struct timeval timeout,
- uint32_t destnode,
- struct ctdb_control_ip_iface *pub)
+int ctdb_ctrl_del_public_ip(struct ctdb_context *ctdb,
+ struct timeval timeout, uint32_t destnode,
+ struct ctdb_addr_info_old *pub)
{
TDB_DATA data;
int32_t res;
int ret;
- data.dsize = offsetof(struct ctdb_control_ip_iface, iface) + pub->len;
+ data.dsize = offsetof(struct ctdb_addr_info_old, iface) + pub->len;
data.dptr = (unsigned char *)pub;
ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_DEL_PUBLIC_IP, 0,
data, NULL,
@@ -3113,13 +3111,13 @@ int ctdb_ctrl_del_public_ip(struct ctdb_context *ctdb,
int ctdb_ctrl_killtcp(struct ctdb_context *ctdb,
struct timeval timeout,
uint32_t destnode,
- struct ctdb_tcp_connection *killtcp)
+ struct ctdb_connection *killtcp)
{
TDB_DATA data;
int32_t res;
int ret;
- data.dsize = sizeof(struct ctdb_tcp_connection);
+ data.dsize = sizeof(struct ctdb_connection);
data.dptr = (unsigned char *)killtcp;
ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_KILL_TCP, 0, data,
NULL,
@@ -3135,22 +3133,20 @@ int ctdb_ctrl_killtcp(struct ctdb_context *ctdb,
/*
send a gratious arp
*/
-int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb,
- struct timeval timeout,
- uint32_t destnode,
- ctdb_sock_addr *addr,
- const char *ifname)
+int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb,
+ struct timeval timeout, uint32_t destnode,
+ ctdb_sock_addr *addr, const char *ifname)
{
TDB_DATA data;
int32_t res;
int ret, len;
- struct ctdb_control_gratious_arp *gratious_arp;
+ struct ctdb_addr_info_old *gratious_arp;
--
Samba Shared Repository
