persistent_callback: ignore the update-recordreturn code of remote node in recovery

[sahlberg/ctdb.git] / ib / ibw_ctdb.c

diff --git a/ib/ibw_ctdb.c b/ib/ibw_ctdb.c
index d8528ec5f06328c2aaa362fb0764a965cfe81d6a..5664c193acb95bbc1c776ef0826f244de2240fe6 100644 (file)
--- a/ib/ibw_ctdb.c
+++ b/ib/ibw_ctdb.c
@@ -8,7 +8,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,12 +17,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
 #include <system/network.h>
 #include <assert.h>
 #include "ctdb_private.h"
@@ -57,13 +56,13 @@ int ctdb_ibw_node_connect(struct ctdb_node *node)
        sock_out.sin_port = htons(node->address.port);
        sock_out.sin_family = PF_INET;
        if (ctdb_ibw_get_address(node->ctdb, node->address.address, &sock_out.sin_addr)) {
-               DEBUG(0, ("ctdb_ibw_node_connect failed\n"));
+               DEBUG(DEBUG_ERR, ("ctdb_ibw_node_connect failed\n"));
                return -1;
        }
 
        rc = ibw_connect(cn->conn, &sock_out, node);
        if (rc) {
-               DEBUG(0, ("ctdb_ibw_node_connect/ibw_connect failed - retrying...\n"));
+               DEBUG(DEBUG_ERR, ("ctdb_ibw_node_connect/ibw_connect failed - retrying...\n"));
                /* try again once a second */
                event_add_timed(node->ctdb->ev, node, timeval_current_ofs(1, 0), 
                        ctdb_ibw_node_connect_event, node);
@@ -93,7 +92,7 @@ int ctdb_ibw_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn *conn)
                case IBWS_CONNECT_REQUEST: /* after [IBWS_READY + incoming request] */
                                /* => [(ibw_accept)IBWS_READY | (ibw_disconnect)STOPPED | ERROR] */
                        if (ibw_accept(ctx, conn, NULL)) {
-                               DEBUG(0, ("connstate_handler/ibw_accept failed\n"));
+                               DEBUG(DEBUG_ERR, ("connstate_handler/ibw_accept failed\n"));
                                return -1;
                        } /* else continue in IBWC_CONNECTED */
                        break;
@@ -137,7 +136,7 @@ int ctdb_ibw_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn *conn)
                                struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node);
                                struct ibw_ctx *ictx = cn->conn->ctx;
 
-                               DEBUG(10, ("IBWC_ERROR, reconnecting...\n"));
+                               DEBUG(DEBUG_DEBUG, ("IBWC_ERROR, reconnecting...\n"));
                                talloc_free(cn->conn); /* internal queue content is destroyed */
                                cn->conn = (void *)ibw_conn_new(ictx, node);
                                event_add_timed(node->ctdb->ev, node, timeval_current_ofs(1, 0),
@@ -167,6 +166,8 @@ int ctdb_ibw_receive_handler(struct ibw_conn *conn, void *buf, int n)
         * and being reused for next receive
         * noticed that HL requires talloc-ed memory to be stolen */
        buf2 = talloc_zero_size(conn, n);
+       CTDB_NO_MEMORY(ctdb, buf2);
+
        memcpy(buf2, buf, n);
 
        ctdb->upcalls->recv_pkt(ctdb, (uint8_t *)buf2, (uint32_t)n);