Commit 3dae7e93 authored by unknown's avatar unknown
Browse files

some more printouts to SHOW command 


mysql-test/ndb/ndbcluster.sh:
  stop instead of kill
parent 30f6acf4

mysql-test/ndb/ndbcluster.sh

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ stop_default_ndbcluster() { 
exec_mgmtclient="$exec_mgmtclient --try-reconnect=1"



echo "all stop" | $exec_mgmtclient 2>&1 | cat > /dev/null

echo "3 stop" | $exec_mgmtclient 2>&1 | cat > /dev/null



if [ -f "$fs_ndb/$pidfile" ] ; then

  kill -9 `cat "$fs_ndb/$pidfile"` 2> /dev/null

ndb/src/mgmclient/CommandInterpreter.cpp

+23 −16
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ CommandInterpreter::executeShow(char* parameters) 
    }



    int

      master_id= 0,

      ndb_nodes= 0,

      api_nodes= 0,

      mgm_nodes= 0;
@@ -659,6 +660,8 @@ CommandInterpreter::executeShow(char* parameters) 
	api_nodes++;

	break;

      case NDB_MGM_NODE_TYPE_NDB:

	if (state->node_states[i].dynamic_id > master_id)

	  master_id= state->node_states[i].dynamic_id;

	ndb_nodes++;

	break;

      case NDB_MGM_NODE_TYPE_MGM:
@@ -681,8 +684,11 @@ CommandInterpreter::executeShow(char* parameters) 
	  ndbout << "  (Version: "

		 << getMajor(state->node_states[i].version) << "."

		 << getMinor(state->node_states[i].version) << "."

		 << getBuild(state->node_states[i].version) << ")" << endl;

	  

		 << getBuild(state->node_states[i].version) << ","

		 << " Nodegroup: " << state->node_states[i].node_group;

	  if (state->node_states[i].dynamic_id == master_id)

	    ndbout << ", Master";

	  ndbout << ")" << endl;

	} else

	  {

	    ndbout << "  (not connected) " << endl;
@@ -692,13 +698,13 @@ CommandInterpreter::executeShow(char* parameters) 
    }

    ndbout << endl;

    

    ndbout << api_nodes

	   << " API Node(s)" 

    ndbout << mgm_nodes

	   << " MGM Node(s)" 

	   << endl;



    for(i=0; i < state->no_of_nodes; i++) {

      if(state->node_states[i].node_type == NDB_MGM_NODE_TYPE_API) {

	ndbout << "API node:\t" << state->node_states[i].node_id;

      if(state->node_states[i].node_type == NDB_MGM_NODE_TYPE_MGM) {

	ndbout << "MGM node:\t" << state->node_states[i].node_id;

	if(state->node_states[i].version != 0) {

	  ndbout << "  (Version: "

		 << getMajor(state->node_states[i].version) << "."
@@ -707,19 +713,19 @@ CommandInterpreter::executeShow(char* parameters) 
	  

	} else

	  {

	    ndbout << "  (not connected) " << endl;

	    ndbout << "  (no version information available) " << endl;

	  }

      }

    }

    ndbout << endl;



    ndbout << mgm_nodes

	   << " MGM Node(s)" 

    ndbout << api_nodes

	   << " API Node(s)" 

	   << endl;



    for(i=0; i < state->no_of_nodes; i++) {

      if(state->node_states[i].node_type == NDB_MGM_NODE_TYPE_MGM) {

	ndbout << "MGM node:\t" << state->node_states[i].node_id;

      if(state->node_states[i].node_type == NDB_MGM_NODE_TYPE_API) {

	ndbout << "API node:\t" << state->node_states[i].node_id;

	if(state->node_states[i].version != 0) {

	  ndbout << "  (Version: "

		 << getMajor(state->node_states[i].version) << "."
@@ -728,11 +734,12 @@ CommandInterpreter::executeShow(char* parameters) 
	  

	} else

	  {

	    ndbout << "  (no version information available) " << endl;

	    ndbout << "  (not connected) " << endl;

	  }

      }

    }

    ndbout << endl;

    

    //    ndbout << helpTextShow;

    return;

  } else if (strcmp(parameters, "PROPERTIES") == 0 ||