fix IM to display version string in "show instance status" (Bug #10229) (26f03563) · Commits · Software / OSDI20 Artifacts / mariadb

server-tools/instance-manager/buffer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ class Buffer

		~Buffer()
		{
		free(buffer);
		my_free(buffer, MYF(0));
		}

		public:

server-tools/instance-manager/commands.cc

+4 −5

Original line number	Diff line number	Diff line
		@@ -203,15 +203,14 @@ int Show_instance_status::execute(struct st_net *net,
		if (!(instance= instance_map->find(instance_name, strlen(instance_name))))
		goto err;
		if (instance->is_running())
		{
		store_to_string(&send_buff, (char*) "online", &position);
		store_to_string(&send_buff, "unknown", &position);
		}
		else
		{
		store_to_string(&send_buff, (char*) "offline", &position);

		if (instance->options.mysqld_version)
		store_to_string(&send_buff, instance->options.mysqld_version, &position);
		else
		store_to_string(&send_buff, (char*) "unknown", &position);
		}


		if (send_buff.is_error() \|\|

server-tools/instance-manager/instance_options.cc

+95 −20

Original line number	Diff line number	Diff line
		@@ -27,6 +27,39 @@
		#include <signal.h>
		#include <m_string.h>

		#ifdef __WIN__
		#define NEWLINE_LEN 2
		#else
		#define NEWLINE_LEN 1
		#endif


		/* Create "mysqld ..." command in the buffer */

		static inline int create_mysqld_command(Buffer *buf,
		const char *mysqld_path_str,
		uint mysqld_path_len,
		const char *option,
		uint option_len)
		{
		int position= 0;

		if (buf->get_size()) /* malloc succeeded */
		{
		buf->append(position, mysqld_path_str, mysqld_path_len);
		position+= mysqld_path_len;
		/* here the '\0' character is copied from the option string */
		buf->append(position, option, option_len);

		if (buf->is_error())
		return 1;
		}
		else
		return 1;

		return 0;
		}


		/*
		Get compiled-in value of default_option
		@@ -50,44 +83,83 @@
		int Instance_options::get_default_option(char *result, size_t result_len,
		const char *option_name)
		{
		int position= 0;
		int rc= 1;
		char verbose_option[]= " --no-defaults --verbose --help";

		Buffer cmd(strlen(mysqld_path) + sizeof(verbose_option) + 1);
		if (cmd.get_size()) /* malloc succeeded */
		{
		cmd.append(position, mysqld_path, strlen(mysqld_path));
		position+= strlen(mysqld_path);
		cmd.append(position, verbose_option, sizeof(verbose_option) - 1);
		position+= sizeof(verbose_option) - 1;
		cmd.append(position, "\0", 1);
		/* reserve space fot the path + option + final '\0' */
		Buffer cmd(mysqld_path_len + sizeof(verbose_option));

		if (cmd.is_error())
		if (create_mysqld_command(&cmd, mysqld_path, mysqld_path_len,
		verbose_option, sizeof(verbose_option)))
		goto err;
		/* get the value from "mysqld --help --verbose" */

		/* +2 eats first "--" from the option string (E.g. "--datadir") */
		rc= parse_output_and_get_value(cmd.buffer, option_name + 2,
		result, result_len);

		return rc;
		err:
		return 1;
		}


		/*
		Fill mysqld_version option (used at initialization stage)

		SYNOPSYS
		fill_instance_version()

		DESCRIPTION

		Get mysqld version string from "mysqld --version" output.

		RETURN
		0 - ok
		1 - error occured
		*/

		int Instance_options::fill_instance_version()
		{
		enum { MAX_VERSION_STRING_LENGTH= 160 };
		enum { RETURN_LINE= 1 };
		char result[MAX_VERSION_STRING_LENGTH];
		char version_option[]= " --version";
		int rc= 1;
		Buffer cmd(mysqld_path_len + sizeof(version_option));

		if (create_mysqld_command(&cmd, mysqld_path, mysqld_path_len,
		version_option, sizeof(version_option)))
		goto err;

		rc= parse_output_and_get_value(cmd.buffer, mysqld_path,
		result, MAX_VERSION_STRING_LENGTH,
		RETURN_LINE);

		if (*result != '\0')
		{
		/* chop the newline from the end of the version string */
		result[strlen(result) - NEWLINE_LEN]= '\0';
		mysqld_version= strdup_root(&alloc, result);
		}

		return rc;

		err:
		return 1;
		}


		/*
		Get compiled-in value of default_option
		Fill various log options

		SYNOPSYS
		get_default_option()
		result buffer to put found value
		result_len buffer size
		option_name the name of the option, prefixed with "--"
		fill_log_options()

		DESCRIPTION

		Get compile-in value of requested option from server
		Compute paths to enabled log files. If the path is not specified in the
		instance explicitly (I.e. log=/home/user/mysql.log), we try to guess the
		file name and placement.

		RETURN
		0 - ok
		@@ -276,6 +348,8 @@ int Instance_options::complete_initialization(const char *default_path,
		goto err;
		}

		mysqld_path_len= strlen(mysqld_path);

		if (mysqld_port)
		mysqld_port_val= atoi(strchr(mysqld_port, '=') + 1);

		@@ -330,7 +404,8 @@ int Instance_options::complete_initialization(const char *default_path,
		options_array.elementssizeof(char));
		argv[filled_default_options + options_array.elements]= 0;

		fill_log_options();
		if (fill_log_options() \|\| fill_instance_version())
		goto err;

		return 0;

server-tools/instance-manager/instance_options.h

+8 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ class Instance_options
		{
		public:
		Instance_options() :
		mysqld_socket(0), mysqld_datadir(0),
		mysqld_version(0), mysqld_socket(0), mysqld_datadir(0),
		mysqld_bind_address(0), mysqld_pid_file(0), mysqld_port(0),
		mysqld_port_val(0), mysqld_path(0), nonguarded(0), shutdown_delay(0),
		shutdown_delay_val(0), filled_default_options(0)
		@@ -64,6 +64,11 @@ class Instance_options
		enum { MEM_ROOT_BLOCK_SIZE= 512 };
		char pid_file_with_path[MAX_PATH_LEN];
		char **argv;
		/*
		Here we cache the version string, obtained from mysqld --version.
		In the case when mysqld binary is not found we get "unknown" here.
		*/
		const char *mysqld_version;
		/* We need the some options, so we store them as a separate pointers */
		const char *mysqld_socket;
		const char *mysqld_datadir;
		@@ -74,6 +79,7 @@ class Instance_options
		const char *instance_name;
		uint instance_name_len;
		const char *mysqld_path;
		uint mysqld_path_len;
		const char *nonguarded;
		const char *shutdown_delay;
		uint shutdown_delay_val;
		@@ -84,6 +90,7 @@ class Instance_options
		DYNAMIC_ARRAY options_array;
		private:
		int fill_log_options();
		int fill_instance_version();
		int add_to_argv(const char *option);
		int get_default_option(char *result, size_t result_len,
		const char *option_name);

server-tools/instance-manager/options.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -224,10 +224,10 @@ int Options::load(int argc, char **argv)

		/* config-file options are prepended to command-line ones */
		load_defaults("my", default_groups, &argc, &argv);
		Options::saved_argv= argv;

		if ((rc= handle_options(&argc, &argv, my_long_options, get_one_option)) != 0)
		return rc;
		Options::saved_argv= argv;
		return 0;
		}