Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 (cbd5d91c) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/ndb/basic.result

0 → 100644

+68 −0

Original line number	Diff line number	Diff line
		-- NDB Cluster -- Management Client --
		---------------------------------------------------------------------------
		NDB Cluster -- Management Client -- Help
		---------------------------------------------------------------------------
		HELP Print help text
		HELP SHOW Help for SHOW command
		HELP DEBUG Help for debug compiled version
		SHOW Print information about cluster
		START BACKUP Start backup
		ABORT BACKUP <backup id> Abort backup
		SHUTDOWN Shutdown all processes in cluster and quit
		CLUSTERLOG ON [<severity>] ... Enable Cluster logging
		CLUSTERLOG OFF [<severity>] ... Disable Cluster logging
		CLUSTERLOG TOGGLE [<severity>] ... Toggle severity filter on/off
		CLUSTERLOG INFO Print cluster log information
		<id> START Start DB node (started with -n)
		<id> RESTART [-n] [-i] Restart DB node
		<id> STOP Stop DB node
		ENTER SINGLE USER MODE <api-node> Enter single user mode
		EXIT SINGLE USER MODE Exit single user mode
		<id> STATUS Print status
		<id> CLUSTERLOG {<category>=<level>}+ Set log level for cluster log
		PURGE STALE SESSIONS Reset reserved nodeid's in the mgmt server
		CONNECT [<connectstring>] Connect to management server (reconnect if already connected)
		QUIT Quit management client

		<severity> = ALERT \| CRITICAL \| ERROR \| WARNING \| INFO \| DEBUG
		<category> = STARTUP \| SHUTDOWN \| STATISTICS \| CHECKPOINT \| NODERESTART \| CONNECTION \| INFO \| ERROR \| GREP \| DEBUG \| BACKUP
		<level> = 0 - 15
		<id> = ALL \| Any database node id

		Connected to Management Server at: localhost:1186
		Node 1: started (Version 4.1.8)
		Node 2: started (Version 4.1.8)

		Node 1: started (Version 4.1.8)

		Node 2: started (Version 4.1.8)

		Executing CLUSTERLOG on node 1 OK!
		Executing CLUSTERLOG on node 2 OK!

		Executing CLUSTERLOG on node 1 OK!
		Executing CLUSTERLOG on node 2 OK!

		Executing CLUSTERLOG on node 1 OK!
		Executing CLUSTERLOG on node 2 OK!

		Executing CLUSTERLOG on node 1 OK!
		Executing CLUSTERLOG on node 2 OK!

		Executing CLUSTERLOG on node 1 OK!
		Executing CLUSTERLOG on node 2 OK!

		Executing CLUSTERLOG on node 1 OK!
		Executing CLUSTERLOG on node 2 OK!

		Executing CLUSTERLOG on node 1 OK!
		Executing CLUSTERLOG on node 2 OK!

		Executing CLUSTERLOG on node 1 OK!
		Executing CLUSTERLOG on node 2 OK!

		Cluster logging is disabled
		Cluster logging is enabled.
		Cluster logging is disabled
		ALL disabled
		ALL enabled

mysql-test/ndb/basic.test

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		help
		all status
		1 status
		2 status
		all clusterlog connection=8
		all clusterlog startup=7
		all clusterlog checkpoint=7
		all clusterlog noderestart=15
		all clusterlog statistics=7
		all clusterlog error=7
		all clusterlog info=7
		all clusterlog backup=15
		clusterlog off
		clusterlog toggle
		clusterlog off
		clusterlog off all
		clusterlog on all

mysql-test/ndb/basic_log.result

0 → 100644

+0 −0

Empty file added.

mysql-test/ndb/ndbcluster.sh

+55 −2

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ fi

		pidfile=ndbcluster.pid
		cfgfile=Ndb.cfg
		test_ndb=
		stop_ndb=
		initial_ndb=
		status_ndb=
		@@ -59,6 +60,9 @@ ndb_imem=24M

		while test $# -gt 0; do
		case "$1" in
		--test)
		test_ndb=1
		;;
		--stop)
		stop_ndb=1
		;;
		@@ -231,7 +235,7 @@ status_ndbcluster

		status_ndbcluster() {
		# Start management client
		echo "show" \| $exec_mgmtclient
		$exec_mgmtclient -e show
		}

		stop_default_ndbcluster() {
		@@ -240,7 +244,7 @@ stop_default_ndbcluster() {

		exec_mgmtclient="$exec_mgmtclient --try-reconnect=1"

		echo "shutdown" \| $exec_mgmtclient 2>&1 \| cat > /dev/null
		$exec_mgmtclient -e shutdown 2>&1 \| cat > /dev/null

		if [ -f "$fs_ndb/$pidfile" ] ; then
		kill_pids=`cat "$fs_ndb/$pidfile"`
		@@ -275,6 +279,44 @@ if [ -f "$fs_ndb/$pidfile" ] ; then
		fi
		}

		initialize_ndb_test ()
		{
		fs_result=$fs_ndb/r
		rm -rf $fs_result
		mkdir $fs_result
		echo ------------------
		echo starting ndb tests
		echo ------------------
		}

		do_ndb_test ()
		{
		test_name=$1

		clusterlog=$fs_ndb/ndb_3_cluster.log

		test_log_result=$fs_result/${test_name}_log.result
		test_log_reject=$fs_result/${test_name}_log.reject
		test_result=$fs_result/${test_name}.result
		test_reject=$fs_result/${test_name}.reject

		clean_log='s/.*\[MgmSrvr\]//'

		cat $clusterlog ndb/${test_name}_log.result \| sed -e $clean_log > $test_log_result

		cp ndb/${test_name}.result $test_result

		cat ndb/${test_name}.test \| $exec_mgmtclient > $test_reject
		cat $clusterlog \| sed -e $clean_log > $test_log_reject

		t="pass"
		diff -C 5 $test_result $test_reject \|\| t="fail"
		printf "ndb_mgm output %20s [%s]\n" $test_name $t
		t="pass"
		diff -C 5 $test_log_result $test_log_reject \|\| t="fail"
		printf "clusterlog output %20s [%s]\n" $test_name $t
		}

		if [ $status_ndb ] ; then
		status_ndbcluster
		exit 0
		@@ -286,4 +328,15 @@ else
		start_default_ndbcluster
		fi

		if [ $test_ndb ] ; then
		initialize_ndb_test
		all_tests=`ls ndb/*.test \| sed "s#ndb/##" \| sed "s#.test##"`
		for a in $all_tests ; do
		do_ndb_test $a
		done
		echo ------------------
		echo shutting down cluster
		stop_default_ndbcluster
		fi

		exit 0

mysql-test/ndb/restart.result

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		-- NDB Cluster -- Management Client --
		Connected to Management Server at: localhost:1186
		ALL disabled
		Cluster logging is enabled.
		ALERT enabled
		Executing CLUSTERLOG on node 1 OK!
		Executing CLUSTERLOG on node 2 OK!

		Node 1 is being restarted.

		Executing CLUSTERLOG on node 1 OK!
		Executing CLUSTERLOG on node 2 OK!

		Node 1 is being restarted.

		ALL enabled