Changeset 740 for vendor/current/source3/lib/ctdbd_conn.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/lib/ctdbd_conn.c (modified) (19 diffs)

vendor/current/source3/lib/ctdbd_conn.c ¶

@@ -20 +20 @@
 
 #include "includes.h"
+#include "util_tdb.h"
 
 #ifdef CLUSTER_SUPPORT
 
-#include "librpc/gen_ndr/messaging.h"
-#include "librpc/gen_ndr/ndr_messaging.h"
+#include "ctdbd_conn.h"
+#include "packet.h"
+#include "messages.h"
 
 /* paths to these include files come from --with-ctdb= in configure */
@@ -58 +60 @@
            so that someone else can take over without getting sharing
            violations */
-        _exit(0);
+        _exit(1);
 }
 
@@ -105 +107 @@
 }
 
+/*
+ * Are we active (i.e. not banned or stopped?)
+ */
+static bool ctdbd_working(struct ctdbd_connection *conn, uint32_t vnn)
+{
+        int32_t cstatus=-1;
+        NTSTATUS status;
+        TDB_DATA outdata;
+        struct ctdb_node_map *m;
+        uint32_t failure_flags;
+        bool ret = false;
+        int i;
+
+        status = ctdbd_control(conn, CTDB_CURRENT_NODE,
+                               CTDB_CONTROL_GET_NODEMAP, 0, 0,
+                               tdb_null, talloc_tos(), &outdata, &cstatus);
+        if (!NT_STATUS_IS_OK(status)) {
+                cluster_fatal("ctdbd_control failed\n");
+        }
+        if ((cstatus != 0) || (outdata.dptr == NULL)) {
+                DEBUG(2, ("Received invalid ctdb data\n"));
+                return false;
+        }
+
+        m = (struct ctdb_node_map *)outdata.dptr;
+
+        for (i=0; i<m->num; i++) {
+                if (vnn == m->nodes[i].pnn) {
+                        break;
+                }
+        }
+
+        if (i == m->num) {
+                DEBUG(2, ("Did not find ourselves (node %d) in nodemap\n",
+                          (int)vnn));
+                goto fail;
+        }
+
+        failure_flags = NODE_FLAGS_BANNED | NODE_FLAGS_DISCONNECTED
+                | NODE_FLAGS_PERMANENTLY_DISABLED | NODE_FLAGS_STOPPED;
+
+        if ((m->nodes[i].flags & failure_flags) != 0) {
+                DEBUG(2, ("Node has status %x, not active\n",
+                          (int)m->nodes[i].flags));
+                goto fail;
+        }
+
+        ret = true;
+fail:
+        TALLOC_FREE(outdata.dptr);
+        return ret;
+}
+
 uint32 ctdbd_vnn(const struct ctdbd_connection *conn)
 {
@@ -136 +191 @@
         strncpy(addr.sun_path, sockname, sizeof(addr.sun_path));
 
-        if (sys_connect(fd, (struct sockaddr *)&addr) == -1) {
+        if (sys_connect(fd, (struct sockaddr *)(void *)&addr) == -1) {
                 DEBUG(1, ("connect(%s) failed: %s\n", sockname,
                           strerror(errno)));
@@ -258 +313 @@
 
         ndr_err = ndr_pull_struct_blob(
-                &blob, result, NULL, result,
+                &blob, result, result,
                 (ndr_pull_flags_fn_t)ndr_pull_messaging_rec);
 
@@ -278 +333 @@
 static NTSTATUS ctdb_packet_fd_read_sync(struct packet_context *ctx)
 {
-        struct timeval timeout;
-        struct timeval *ptimeout;
-
-        timeout = timeval_set(lp_ctdb_timeout(), 0);
-        ptimeout = (timeout.tv_sec != 0) ? &timeout : NULL;
-
-        return packet_fd_read_sync(ctx, ptimeout);
+        int timeout = lp_ctdb_timeout();
+
+        if (timeout == 0) {
+                timeout = -1;
+        }
+        return packet_fd_read_sync(ctx, timeout);
 }
 
@@ -369 +423 @@
                                   ? "cluster reconfigure" : "SAMBA_NOTIFY"));
 
-                        messaging_send(conn->msg_ctx, procid_self(),
+                        messaging_send(conn->msg_ctx,
+                                       messaging_server_id(conn->msg_ctx),
                                        MSG_SMB_BRL_VALIDATE, &data_blob_null);
-                        messaging_send(conn->msg_ctx, procid_self(),
+                        messaging_send(conn->msg_ctx,
+                                       messaging_server_id(conn->msg_ctx),
                                        MSG_DBWRAP_G_LOCK_RETRY,
                                        &data_blob_null);
@@ -378 +434 @@
                 }
 
-                if (!(msg_state = TALLOC_P(talloc_autofree_context(), struct deferred_msg_state))) {
+                msg_state = TALLOC_P(NULL, struct deferred_msg_state);
+                if (msg_state == NULL) {
                         DEBUG(0, ("talloc failed\n"));
                         TALLOC_FREE(hdr);
@@ -432 +489 @@
  */
 
-NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
-                               struct ctdbd_connection **pconn)
+static NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
+                                      struct ctdbd_connection **pconn)
 {
         struct ctdbd_connection *conn;
@@ -454 +511 @@
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(10, ("get_cluster_vnn failed: %s\n", nt_errstr(status)));
+                goto fail;
+        }
+
+        if (!ctdbd_working(conn, conn->our_vnn)) {
+                DEBUG(2, ("Node is not working, can not connect\n"));
+                status = NT_STATUS_INTERNAL_DB_ERROR;
                 goto fail;
         }
@@ -565 +628 @@
                  * clean the brl database
                  */
-                messaging_send(conn->msg_ctx, procid_self(),
+                messaging_send(conn->msg_ctx,
+                               messaging_server_id(conn->msg_ctx),
                                MSG_SMB_BRL_VALIDATE, &data_blob_null);
 
-                messaging_send(conn->msg_ctx, procid_self(),
+                messaging_send(conn->msg_ctx,
+                               messaging_server_id(conn->msg_ctx),
                                MSG_DBWRAP_G_LOCK_RETRY,
                                &data_blob_null);
@@ -671 +736 @@
 
         ndr_err = ndr_push_struct_blob(
-                &blob, mem_ctx, NULL, msg,
+                &blob, mem_ctx, msg,
                 (ndr_push_flags_fn_t)ndr_push_messaging_rec);
 
@@ -758 +823 @@
         req.srvid            = srvid;
         req.datalen          = data.dsize;
+        req.flags            = flags;
 
         DEBUG(10, ("ctdbd_control: Sending ctdb packet\n"));
@@ -781 +847 @@
         if (flags & CTDB_CTRL_FLAG_NOREPLY) {
                 TALLOC_FREE(new_conn);
+                if (cstatus) {
+                        *cstatus = 0;
+                }
                 return NT_STATUS_OK;
         }
@@ -881 +950 @@
                                ? CTDB_CONTROL_DB_ATTACH_PERSISTENT
                                : CTDB_CONTROL_DB_ATTACH,
-                               0, 0, data, NULL, &data, &cstatus);
+                               tdb_flags, 0, data, NULL, &data, &cstatus);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0, (__location__ " ctdb_control for db_attach "
@@ -1275 +1344 @@
         switch (client.ss_family) {
         case AF_INET:
-                p4.dest = *(struct sockaddr_in *)&server;
-                p4.src = *(struct sockaddr_in *)&client;
+                p4.dest = *(struct sockaddr_in *)(void *)&server;
+                p4.src = *(struct sockaddr_in *)(void *)&client;
                 data.dptr = (uint8_t *)&p4;
                 data.dsize = sizeof(p4);
@@ -1282 +1351 @@
 #ifdef HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR
         case AF_INET6:
-                p.dest.ip6 = *(struct sockaddr_in6 *)&server;
-                p.src.ip6 = *(struct sockaddr_in6 *)&client;
+                p.dest.ip6 = *(struct sockaddr_in6 *)(void *)&server;
+                p.src.ip6 = *(struct sockaddr_in6 *)(void *)&client;
                 data.dptr = (uint8_t *)&p;
                 data.dsize = sizeof(p);
@@ -1293 +1362 @@
 
         conn->release_ip_handler = release_ip_handler;
+        /*
+         * store the IP address of the server socket for later
+         * comparison in release_ip()
+         */
+        conn->release_ip_priv = private_data;
 
         /*
@@ -1376 +1450 @@
 }
 
-#else
-
-NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
-                               struct ctdbd_connection **pconn)
-{
-        return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 #endif