Intermediate commit - just to make new files visible to bk in the new

tree


server-tools/instance-manager/Makefile.am:
  Fixed IM linking to avoid using both mysys and libmysql as the define the
  same symbols and therefore conflict
server-tools/instance-manager/listener.cc:
  Added ability to listen network ports
server-tools/instance-manager/listener.h:
  Various additions to the Listener_thread_args
server-tools/instance-manager/log.cc:
  merge
server-tools/instance-manager/log.h:
  merge
server-tools/instance-manager/manager.cc:
  Fixes and additions to enable guardian functionality
server-tools/instance-manager/manager.h:
  Changed manager() signature
server-tools/instance-manager/mysqlmanager.cc:
  Various fixes
server-tools/instance-manager/options.cc:
  Added handling of default values for new options in the Options struct. (such
  as default_user, default_password, monitoring_interval e.t.c)
server-tools/instance-manager/options.h:
  Added new options to the Options struct
sql/net_serv.cc:
  Added MYSQL_INSTANCE_MANAGER defines to enable alarm handling in the IM
server-tools/instance-manager/buffer.cc:
  Simple implementation of variable-length buffer
server-tools/instance-manager/command.cc:
  Abstract command. All commands are derived from Command class
server-tools/instance-manager/commands.h:
  Interfaces for all commands we have
server-tools/instance-manager/factory.cc:
  Commands factory. This class hides command instantiation. The idea is to
  handle various protocols this way. (different commands for different
  protocols
server-tools/instance-manager/guardian.cc:
  Guardian thread implementation (monitor and restart instances in case of a
  failure
server-tools/instance-manager/guardian.h:
  Guardian_thread and Guardian_thread_args class interface. The
  Guardian_thread is responsible for monitoring and restarting instances
server-tools/instance-manager/instance.cc:
  Instance class contains methods and data to manage a single instance
server-tools/instance-manager/instance.h:
  This file contains class an instance class interface. The class is
  responsible for starting/stopping an instance
server-tools/instance-manager/instance_map.cc:
  The instance repository. This class is also responsible for initialization
  of Instance class objects.
server-tools/instance-manager/instance_options.cc:
  The Instance_options class contains all methods to get and  handle options
  of an instance
server-tools/instance-manager/mysql_connection.cc:
  The class responsible for handling MySQL client/server protocol connections
server-tools/instance-manager/mysql_manager_error.h:
  The list of Instance Manger-specific errors
server-tools/instance-manager/parse.cc:
  Simple query parser
server-tools/instance-manager/parse.h:
  Parser interface
server-tools/instance-manager/protocol.cc:
  Here implemented functions used to handle mysql client/server protocol
server-tools/instance-manager/protocol.h:
  Interface for MySQL client/server protocol
server-tools/instance-manager/thread_registry.cc:
  Thread registry stores information about every thread. It's main function is
  to provide graceful shutdown for all threads.
server-tools/instance-manager/user_map.h:
  User map contains hash with user names and passwords

1 files changed, 183 insertions, 0 deletions

diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc
new file mode 100644
index 00000000000..e990f04216d
--- /dev/null
+++ b/server-tools/instance-manager/commands.cc
@@ -0,0 +1,183 @@
+/* Copyright (C) 2004 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include "command.h"
+#include "factory.h"
+#include "commands.h"
+#include "instance.h"
+#include "instance_map.h"
+#include "messages.h"
+
+
+/* implementation for Show_instances: */
+
+int Show_instances::execute(struct st_net *net, ulong connection_id)
+{
+  if (factory->instance_map.show_instances(net))
+    return ER_OUT_OF_RESOURCES;
+
+  return 0;
+}
+
+
+/* implementation for Flush_instances: */
+
+int Flush_instances::execute(struct st_net *net, ulong connection_id)
+{
+  if (factory->instance_map.flush_instances())
+    return ER_OUT_OF_RESOURCES;
+
+  net_send_ok(net, connection_id);
+  return 0;
+}
+
+
+/* implementation for Show_instance_status: */
+
+Show_instance_status::Show_instance_status(Command_factory *factory,
+                                           const char *name, uint len)
+  :Command(factory)
+{
+  Instance *instance;
+
+  /* we make a search here, since we don't want t store the name */
+  if (instance= (factory->instance_map).find(name, len))
+  {
+    instance_name= instance->options.instance_name;
+  }
+  else instance_name= NULL;
+}
+
+
+int Show_instance_status::execute(struct st_net *net, ulong connection_id)
+{
+  if (instance_name != NULL)
+  {
+    if (factory->instance_map.show_instance_status(net, instance_name))
+      return ER_OUT_OF_RESOURCES;
+    return 0;
+  }
+  else
+  {
+    return ER_BAD_INSTANCE_NAME;
+  }
+}
+
+
+/* Implementation for Show_instance_options */
+
+Show_instance_options::Show_instance_options(Command_factory *factory,
+                                             const char *name, uint len):
+  Command(factory)
+{
+  Instance *instance;
+
+  /* we make a search here, since we don't want t store the name */
+  if (instance= (factory->instance_map).find(name, len))
+  {
+    instance_name= instance->options.instance_name;
+  }
+  else instance_name= NULL;
+}
+
+
+int Show_instance_options::execute(struct st_net *net, ulong connection_id)
+{
+  if (instance_name != NULL)
+  {
+    if (factory->instance_map.show_instance_options(net, instance_name))
+      return ER_OUT_OF_RESOURCES;
+    return 0;
+  }
+  else
+  {
+    return ER_BAD_INSTANCE_NAME;
+  }
+}
+
+
+/* Implementation for Start_instance */
+
+Start_instance::Start_instance(Command_factory *factory,
+                               const char *name, uint len)
+  :Command(factory)
+{
+  /* we make a search here, since we don't want t store the name */
+  if (instance= (factory->instance_map).find(name, len))
+    instance_name= instance->options.instance_name;
+}
+
+
+int Start_instance::execute(struct st_net *net, ulong connection_id)
+{
+  uint err_code;
+  if (instance == 0)
+  {
+    return ER_BAD_INSTANCE_NAME; /* haven't found an instance */
+  }
+  else
+  {
+    if (err_code= instance->start())
+      return err_code;
+
+    if (instance->options.is_guarded != NULL)
+      factory->instance_map.guardian->guard(instance->options.instance_name,
+                                         instance->options.instance_name_len);
+
+    net_send_ok(net, connection_id);
+    return 0;
+  }
+}
+
+
+/* Implementation for Stop_instance: */
+
+Stop_instance::Stop_instance(Command_factory *factory,
+                               const char *name, uint len)
+  :Command(factory)
+{
+  /* we make a search here, since we don't want t store the name */
+  if (instance= (factory->instance_map).find(name, len))
+    instance_name= instance->options.instance_name;
+}
+
+
+int Stop_instance::execute(struct st_net *net, ulong connection_id)
+{
+  uint err_code;
+
+  if (instance == 0)
+  {
+    return ER_BAD_INSTANCE_NAME; /* haven't found an instance */
+  }
+  else
+  {
+    if (instance->options.is_guarded != NULL)
+      factory->instance_map.guardian->
+               stop_guard(instance_name, instance->options.instance_name_len);
+    if (err_code= instance->stop())
+      return err_code;
+
+    net_send_ok(net, connection_id);
+    return 0;
+  }
+}
+
+
+int Syntax_error::execute(struct st_net *net, ulong connection_id)
+{
+  return ER_SYNTAX_ERROR;
+}