Commit eaf466d2 authored by unknown's avatar unknown
Browse files

added more logging in ndb handler 

    enable extra logging in ndb handler during test runs


mysql-test/mysql-test-run.pl:
  enable extra logging in ndb handler during test runs
sql/ha_ndbcluster_binlog.cc:
  added more logging in ndb handler
parent d588ef9b

mysql-test/mysql-test-run.pl

+2 −0
Original line number Diff line number Diff line
@@ -2316,6 +2316,7 @@ sub mysqld_arguments ($$$$$$) { 
      mtr_add_arg($args, "%s--ndbcluster", $prefix);

      mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,

                  $opt_ndbconnectstring);

      mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);

    }

  }
@@ -2383,6 +2384,7 @@ sub mysqld_arguments ($$$$$$) { 
      mtr_add_arg($args, "%s--ndbcluster", $prefix);

      mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,

                  $opt_ndbconnectstring_slave);

      mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);

    }

  } # end slave

sql/ha_ndbcluster_binlog.cc

+26 −0
Original line number Diff line number Diff line
@@ -1464,6 +1464,14 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, 
      (void) pthread_mutex_lock(&share->mutex);

      bitmap_clear_all(&share->subscriber_bitmap[node_id]);

      DBUG_PRINT("info",("NODE_FAILURE UNSUBSCRIBE[%d]", node_id));

      if (ndb_extra_logging)

      {

        sql_print_information("NDB Binlog: Node: %d, down,"

                              " Subscriber bitmask %x%x",

                              pOp->getNdbdNodeId(),

                              share->subscriber_bitmap[node_id].bitmap[1],

                              share->subscriber_bitmap[node_id].bitmap[0]);

      }

      (void) pthread_mutex_unlock(&share->mutex);

      (void) pthread_cond_signal(&injector_cond);

      break;
@@ -1476,6 +1484,15 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, 
      (void) pthread_mutex_lock(&share->mutex);

      bitmap_set_bit(&share->subscriber_bitmap[node_id], req_id);

      DBUG_PRINT("info",("SUBSCRIBE[%d] %d", node_id, req_id));

      if (ndb_extra_logging)

      {

        sql_print_information("NDB Binlog: Node: %d, subscribe from node %d,"

                              " Subscriber bitmask %x%x",

                              pOp->getNdbdNodeId(),

                              req_id,

                              share->subscriber_bitmap[node_id].bitmap[1],

                              share->subscriber_bitmap[node_id].bitmap[0]);

      }

      (void) pthread_mutex_unlock(&share->mutex);

      (void) pthread_cond_signal(&injector_cond);

      break;
@@ -1488,6 +1505,15 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb, 
      (void) pthread_mutex_lock(&share->mutex);

      bitmap_clear_bit(&share->subscriber_bitmap[node_id], req_id);

      DBUG_PRINT("info",("UNSUBSCRIBE[%d] %d", node_id, req_id));

      if (ndb_extra_logging)

      {

        sql_print_information("NDB Binlog: Node: %d, unsubscribe from node %d,"

                              " Subscriber bitmask %x%x",

                              pOp->getNdbdNodeId(),

                              req_id,

                              share->subscriber_bitmap[node_id].bitmap[1],

                              share->subscriber_bitmap[node_id].bitmap[0]);

      }

      (void) pthread_mutex_unlock(&share->mutex);

      (void) pthread_cond_signal(&injector_cond);

      break;