Commit a38f5cd5 authored by unknown's avatar unknown
Browse files

Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and... 

Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and alters one config file only."


server-tools/instance-manager/commands.cc:
  get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/commands.h:
  get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/instance_map.cc:
  get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/instance_map.h:
  get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/manager.cc:
  get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/options.cc:
  Disable --defaults-extra-file and --no-defaults options for the IM as they have no sence. 
  Don't use print_defaults as it prints out wrong "first option" information for IM. Use only
  Options::config_file to process options
server-tools/instance-manager/options.h:
  get rid of single_defaults_file_option and use Options::config_file instead
parent 34fa3be5

server-tools/instance-manager/commands.cc

+2 −11
Original line number Diff line number Diff line
@@ -644,11 +644,6 @@ Set_option::Set_option(Instance_map *instance_map_arg, 
  if ((instance= instance_map->find(name, len)))

  {

    instance_name= instance->options.instance_name;

    if (instance_map->single_defaults_file_option != NULL)

      single_defaults_file=

        strchr(instance_map->single_defaults_file_option, '=') + 1;

    else

      single_defaults_file= NULL;



     /* add prefix for add_option */

    if ((option_len_arg < MAX_OPTION_LEN - 1) ||
@@ -696,11 +691,7 @@ int Set_option::correct_file(int skip) 
{

  int error;



  if (single_defaults_file != NULL)

    error= modify_defaults_file(single_defaults_file, option,

                                option_value, instance_name, skip);

  else

    error= modify_defaults_file(Options::default_config_file, option,

  error= modify_defaults_file(Options::config_file, option,

                              option_value, instance_name, skip);



  switch (error)

server-tools/instance-manager/commands.h

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ class Set_option : public Command 
public:

  const char *instance_name;

  uint instance_name_len;

  const char *single_defaults_file;

  /* buffer for the option */

  enum { MAX_OPTION_LEN= 1024 };

  char option[MAX_OPTION_LEN];

server-tools/instance-manager/instance_map.cc

+4 −13
Original line number Diff line number Diff line
@@ -113,10 +113,8 @@ static int process_option(void *ctx, const char *group, const char *option) 
C_MODE_END





Instance_map::Instance_map(const char *default_mysqld_path_arg,

                           const char *single_defaults_file_option_arg):

mysqld_path(default_mysqld_path_arg),

single_defaults_file_option(single_defaults_file_option_arg)

Instance_map::Instance_map(const char *default_mysqld_path_arg):

mysqld_path(default_mysqld_path_arg)

{

  pthread_mutex_init(&LOCK_instance_map, 0);

}
@@ -240,20 +238,13 @@ int Instance_map::load() 


  /* the name of the program may be orbitrary here in fact */

  argv_options[0]= "mysqlmanager";

  if (single_defaults_file_option != NULL)

  {

    argc= 2;

    argv_options[1]= single_defaults_file_option;

    argv_options[2]= '\0';

  }

  else

  argv_options[1]= '\0';



  /*

    If the routine failed, we'll simply fallback to defaults in

    complete_initialization().

  */

  if (my_search_option_files(Options::default_config_file, &argc,

  if (my_search_option_files(Options::config_file, &argc,

                             (char ***) &argv, &args_used,

                             process_option, (void*) this))

    log_info("Falling back to compiled-in defaults");

server-tools/instance-manager/instance_map.h

+1 −3
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ class Instance_map 
  int unlock();

  int init();



  Instance_map(const char *default_mysqld_path_arg,

               const char *single_defaults_file_option_arg);

  Instance_map(const char *default_mysqld_path_arg);

  ~Instance_map();



  /* loads options from config files */
@@ -77,7 +76,6 @@ class Instance_map 


public:

  const char *mysqld_path;

  const char *single_defaults_file_option;

  Guardian_thread *guardian;



private:

server-tools/instance-manager/manager.cc

+1 −2
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ void manager(const Options &options) 
  */



  User_map user_map;

  Instance_map instance_map(options.default_mysqld_path,

                            options.single_defaults_file_option);

  Instance_map instance_map(options.default_mysqld_path);

  Guardian_thread guardian_thread(thread_registry,

                                  &instance_map,

                                  options.monitoring_interval);