From 18100b80b9c62833df22638828336294c9740ae0 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Fri, 10 Oct 2014 10:54:15 +1100 Subject: [PATCH] build: Remove checks for ctdb features Since we are always building with integrated CTDB, there is no need for these checks. Signed-off-by: Amitay Isaacs Reviewed-by: Michael Adam --- source3/lib/cluster_support.c | 18 ---- source3/lib/ctdbd_conn.c | 16 --- source3/lib/dbwrap/dbwrap_ctdb.c | 11 --- source3/wscript | 164 ------------------------------- 4 files changed, 209 deletions(-) diff --git a/source3/lib/cluster_support.c b/source3/lib/cluster_support.c index d6605fd3e21..e2aef7b99f9 100644 --- a/source3/lib/cluster_support.c +++ b/source3/lib/cluster_support.c @@ -62,24 +62,6 @@ const char *cluster_support_features(void) #ifdef HAVE_CTDB_PROTOCOL_H _LINE_DEF(HAVE_CTDB_PROTOCOL_H) #endif -#ifdef HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL - _LINE_DEF(HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL) -#endif -#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL - _LINE_DEF(HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL) -#endif -#ifdef HAVE_CTDB_WANT_READONLY_DECL - _LINE_DEF(HAVE_CTDB_WANT_READONLY_DECL) -#endif -#ifdef HAVE_STRUCT_CTDB_CONTROL_TCP - _LINE_DEF(HAVE_STRUCT_CTDB_CONTROL_TCP) -#endif -#ifdef HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR - _LINE_DEF(HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR) -#endif -#ifdef HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL - _LINE_DEF(HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL) -#endif #ifdef CTDB_PATH _LINE_STR(CTDB_PATH) #endif diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index a667482f6b2..fe3e25ad320 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -1110,20 +1110,13 @@ fail: bool ctdb_serverids_exist_supported(struct ctdbd_connection *conn) { -#ifndef HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL - return false; -#else /* HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL */ return true; -#endif /* HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL */ } bool ctdb_serverids_exist(struct ctdbd_connection *conn, const struct server_id *pids, unsigned num_pids, bool *results) { -#ifndef HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL - return false; -#else /* HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL */ unsigned i, num_received; NTSTATUS status; struct ctdb_vnn_list *vnns = NULL; @@ -1267,7 +1260,6 @@ bool ctdb_serverids_exist(struct ctdbd_connection *conn, fail: cluster_fatal("serverids_exist failed"); return false; -#endif /* HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL */ } /* @@ -1421,11 +1413,7 @@ NTSTATUS ctdbd_parse(struct ctdbd_connection *conn, uint32_t db_id, NTSTATUS status; uint32_t flags; -#ifdef HAVE_CTDB_WANT_READONLY_DECL flags = local_copy ? CTDB_WANT_READONLY : 0; -#else - flags = 0; -#endif ZERO_STRUCT(req); @@ -1633,9 +1621,7 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, * versions at runtime */ struct ctdb_control_tcp p4; -#ifdef HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR struct ctdb_control_tcp_addr p; -#endif TDB_DATA data; NTSTATUS status; struct sockaddr_storage client; @@ -1656,14 +1642,12 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, data.dptr = (uint8_t *)&p4; data.dsize = sizeof(p4); break; -#ifdef HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR case AF_INET6: memcpy(&p.dest.ip6, &server, sizeof(p.dest.ip6)); memcpy(&p.src.ip6, &client, sizeof(p.src.ip6)); data.dptr = (uint8_t *)&p; data.dsize = sizeof(p); break; -#endif default: return NT_STATUS_INTERNAL_ERROR; } diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 0b30d9fea3f..2aee435aabf 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -867,7 +867,6 @@ static NTSTATUS db_ctdb_store(struct db_record *rec, TDB_DATA data, int flag) -#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec) { NTSTATUS status; @@ -911,7 +910,6 @@ static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec) return status; } -#endif static NTSTATUS db_ctdb_delete(struct db_record *rec) { @@ -927,10 +925,7 @@ static NTSTATUS db_ctdb_delete(struct db_record *rec) return status; } -#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL status = db_ctdb_send_schedule_for_deletion(rec); -#endif - return status; } @@ -999,7 +994,6 @@ static int db_ctdb_record_destr(struct db_record* data) static bool db_ctdb_can_use_local_hdr(const struct ctdb_ltdb_header *hdr, bool read_only) { -#ifdef HAVE_CTDB_WANT_READONLY_DECL if (hdr->dmaster != get_my_vnn()) { /* If we're not dmaster, it must be r/o copy. */ return read_only && (hdr->flags & CTDB_REC_RO_HAVE_READONLY); @@ -1009,9 +1003,6 @@ static bool db_ctdb_can_use_local_hdr(const struct ctdb_ltdb_header *hdr, * If we want write access, no one may have r/o copies. */ return read_only || !(hdr->flags & CTDB_REC_RO_HAVE_DELEGATIONS); -#else - return (hdr->dmaster == get_my_vnn()); -#endif } static bool db_ctdb_can_use_local_copy(TDB_DATA ctdb_data, bool read_only) @@ -1638,7 +1629,6 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, return NULL; } -#ifdef HAVE_CTDB_WANT_READONLY_DECL if (!result->persistent && (dbwrap_flags & DBWRAP_FLAG_OPTIMIZE_READONLY_ACCESS)) { @@ -1657,7 +1647,6 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, return NULL; } } -#endif lp_ctx = loadparm_init_s3(db_path, loadparm_s3_helpers()); diff --git a/source3/wscript b/source3/wscript index 5ad2dbca045..0c3c9949fb7 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1573,170 +1573,6 @@ main() { if ok: CTDB_CFLAGS += ' -DHAVE_CTDB_PROTOCOL_H=1' - conf.CONFIG_RESET('HAVE_CTDB_CHECK_CODE') - if have_cluster_support: - ok = conf.CHECK_CODE(''' - #define NO_CONFIG_H - #include "replace.h" - #include "system/wait.h" - #include "system/network.h" - #include - #include - #include - #include - - int main(void) - { - int i = (int)CTDB_CONTROL_TRANS3_COMMIT; - return 0; - } - ''', - 'HAVE_CTDB_CHECK_CODE', - addmain=False, - includes=includes, - msg='Checking for transaction support (TRANS3_COMMIT control)') - if ok: - CTDB_CFLAGS += ' -DHAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL=1' - else: - have_cluster_support = False - ctdb_broken = "ctdb transaction support missing or too old" - - conf.CONFIG_RESET('HAVE_CTDB_CHECK_CODE') - if have_cluster_support: - ok = conf.CHECK_CODE(''' - #define NO_CONFIG_H - #include "replace.h" - #include "system/wait.h" - #include "system/network.h" - #include - #include - #include - #include - - int main(void) - { - int i = (int)CTDB_CONTROL_SCHEDULE_FOR_DELETION; - return 0; - } - ''', - 'HAVE_CTDB_CHECK_CODE', - addmain=False, - includes=includes, - msg='Checking for SCHEDULE_FOR_DELETION control') - if ok: - CTDB_CFLAGS += ' -DHAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL=1' - else: - have_cluster_support = False - ctdb_broken = "SCHEDULE_FOR_DELETION control missing" - - conf.CONFIG_RESET('HAVE_CTDB_CHECK_CODE') - if have_cluster_support: - ok = conf.CHECK_CODE(''' - #define NO_CONFIG_H - #include "replace.h" - #include "system/wait.h" - #include "system/network.h" - #include - #include - #include - - int main(void) - { - int i = (int)CTDB_WANT_READONLY; - return 0; - } - ''', - 'HAVE_CTDB_CHECK_CODE', - addmain=False, - includes=includes, - msg='Checking for CTDB readonly records support') - if ok: - CTDB_CFLAGS += ' -DHAVE_CTDB_WANT_READONLY_DECL=1' - else: - have_cluster_support = False - ctdb_broken = "support for CTDB readonly records missing" - - conf.CONFIG_RESET('HAVE_CTDB_CHECK_CODE') - if have_cluster_support: - ok = conf.CHECK_CODE(''' - #define NO_CONFIG_H - #include "replace.h" - #include "system/wait.h" - #include "system/network.h" - #include - #include - #include - #include - - int main(void) - { - struct ctdb_control_tcp _x; - return 0; - } - ''', - 'HAVE_CTDB_CHECK_CODE', - addmain=False, - includes=includes, - msg='Checking for ctdb ipv4 support') - if ok: - CTDB_CFLAGS += ' -DHAVE_STRUCT_CTDB_CONTROL_TCP=1' - else: - have_cluster_support = False - ctdb_broken = "missing struct ctdb_control_tcp" - - conf.CONFIG_RESET('HAVE_CTDB_CHECK_CODE') - if have_cluster_support: - ok = conf.CHECK_CODE(''' - #define NO_CONFIG_H - #include "replace.h" - #include "system/wait.h" - #include "system/network.h" - #include - #include - #include - #include - - int main(void) - { - struct ctdb_control_tcp_addr _x; - return 0; - } - ''', - 'HAVE_CTDB_CHECK_CODE', - addmain=False, - includes=includes, - msg='Checking for ctdb ipv6 support') - if ok: - CTDB_CFLAGS += ' -DHAVE_STRUCT_CTDB_CONTROL_TCP_ADDR=1' - - conf.CONFIG_RESET('HAVE_CTDB_CHECK_CODE') - if have_cluster_support: - ok = conf.CHECK_CODE(''' - #define NO_CONFIG_H - #include "replace.h" - #include "system/wait.h" - #include "system/network.h" - #include - #include - #include - #include - - int main(void) - { - int i = (int)CTDB_CONTROL_CHECK_SRVIDS; - return 0; - } - ''', - 'HAVE_CTDB_CHECK_CODE', - addmain=False, - includes=includes, - msg='Checking for CHECK_SRVIDS control') - if ok: - CTDB_CFLAGS += ' -DHAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL=1' - else: - have_cluster_support = False - ctdb_broken = "CHECK_SRVIDS control missing" - conf.CONFIG_RESET('HAVE_CTDB_CHECK_CODE') conf.undefine('HAVE_CTDB_CHECK_CODE') if have_cluster_support: -- 2.34.1