rpms/mysql-mmm/devel mmm_agent.conf, NONE, 1.1 mmm_common.conf, NONE, 1.1 mmm_mon.conf, NONE, 1.1 mmm_tools.conf, NONE, 1.1 mysql-mmm-2.1.0-paths.patch, NONE, 1.1 import.log, 1.5, 1.6 mmm_mon_log.conf, 1.1, 1.2 mysql-mmm-agent.init, 1.1, 1.2 mysql-mmm-monitor.init, 1.1, 1.2 mysql-mmm.spec, 1.4, 1.5 mysql-mmm-2.0.9-configs.patch, 1.1, NONE mysql-mmm-2.0.9-paths.patch, 1.1, NONE

Tue Feb 23 03:51:59 UTC 2010

Author: derks

Update of /cvs/pkgs/rpms/mysql-mmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10486/devel

Modified Files:
	import.log mmm_mon_log.conf mysql-mmm-agent.init 
	mysql-mmm-monitor.init mysql-mmm.spec 
Added Files:
	mmm_agent.conf mmm_common.conf mmm_mon.conf mmm_tools.conf 
	mysql-mmm-2.1.0-paths.patch 
Removed Files:
	mysql-mmm-2.0.9-configs.patch mysql-mmm-2.0.9-paths.patch 
Log Message:
* Mon Feb 22 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-1
- Latest sources from upstream
- Updated init scripts to reflect new binary paths
  (i.e. mmmd_agent -> mmm_agentd)
- Updated Patch0: mysql-mmm-2.1.0-paths.patch
- Removed Patch1: mysql-mmm-2.0.9-configs.patch (added source
  config files)

--- NEW FILE mmm_agent.conf ---
include mmm_common.conf

# The 'this' variable refers to this server.  Proper operation requires 
# that 'this' server (db1 by default), as well as all other servers, have the 
# proper IP addresses set in mmm_common.conf.
this db1


--- NEW FILE mmm_common.conf ---
active_master_role      writer

<host default>
    cluster_interface       eth0
    pid_path                /var/run/mysql-mmm/mmm_agentd.pid
    bin_path                /usr/libexec/mysql-mmm/
    replication_user        replicant
    replication_password    slave
    agent_user              mmm_agent
    agent_password          RepAgent
</host>

<host db1>
    ip      192.168.100.49
    mode    master
    peer    db2
</host>

<host db2>
    ip      192.168.100.50
    mode    master
    peer    db1
</host>

#<host db3>
#    ip      192.168.100.51
#    mode    slave
#</host>

<role writer>
    hosts   db1, db2
    ips     192.168.100.250
    mode    exclusive
</role>

<role reader>
    hosts   db1, db2
    ips     192.168.100.251, 192.168.100.252
    mode    balanced
</role>


--- NEW FILE mmm_mon.conf ---
include mmm_common.conf

<monitor>
    ip                  127.0.0.1
    pid_path            /var/run/mysql-mmm/mmm_mond.pid
    bin_path            /usr/libexec/mysql-mmm
    status_path         /var/lib/mysql-mmm/mmm_mond.status
    ping_ips            192.168.100.50
    auto_set_online     60

    # The kill_host_bin does not exist by default, though the monitor will
    # throw a warning about it missing.  See the section 5.10 "Kill Host 
    # Functionality" in the PDF documentation.
    #
    # kill_host_bin     /usr/libexec/mysql-mmm/monitor/kill_host
    #
</monitor>

<host default>
    monitor_user        mmm_monitor
    monitor_password    RepMonitor
</host>

debug 0


--- NEW FILE mmm_tools.conf ---
include mmm_agent.conf

default_copy_method         scp
clone_dirs                  data, logs

<host default>
    ssh_user                root

    lvm_snapshot_size       1G
    lvm_logical_volume      mysql
    lvm_volume_group        storage
    lvm_mount_dir           /mmm_snapshot
    lvm_mount_opts          -orw,nouuid

    tools_user              mmm_tools
    tools_password          RepTools

    backup_dir              /mmm_backup
    restore_dir             /mysql
</host>


<copy_method scp>
    backup_command scp -c blowfish -r %SSH_USER%@%IP%:%SNAPSHOT%/%CLONE_DIR% %DEST_DIR%/
    restore_command cp -axv %BACKUP_DIR%/* %DEST_DIR%/
    true_copy 1
</copy_method>

<copy_method rdiff>
    backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
    restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
    incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
    single_run 1
    incremental 1
</copy_method>

<copy_method ssh-gz>
    backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
    restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
    single_run 1
</copy_method>



mysql-mmm-2.1.0-paths.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mysql-mmm-2.1.0-paths.patch ---
--- mysql-mmm-2.1.0/Makefile.orig	2010-02-18 09:49:25.000000000 -0600
+++ mysql-mmm-2.1.0/Makefile	2010-02-22 18:10:53.000000000 -0600
@@ -4,7 +4,7 @@
 endif
 
 MODULEDIR = $(DESTDIR)$(shell eval "`perl -V:${INSTALLDIR}`"; echo "$$${INSTALLDIR}")/MMM
-BINDIR    = $(DESTDIR)/usr/lib/mysql-mmm
+BINDIR    = $(DESTDIR)/usr/libexec/mysql-mmm
 SBINDIR   = $(DESTDIR)/usr/sbin
 LOGDIR    = $(DESTDIR)/var/log/mysql-mmm
 ETCDIR    = $(DESTDIR)/etc


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	22 Feb 2010 23:53:34 -0000	1.5
+++ import.log	23 Feb 2010 03:51:58 -0000	1.6
@@ -3,3 +3,4 @@ mysql-mmm-2_0_11-1:HEAD:mysql-mmm-2.0.11
 mysql-mmm-2_0_11-1:HEAD:mysql-mmm-2.0.11-1.src.rpm:1266440724
 mysql-mmm-2_0_11-2:HEAD:mysql-mmm-2.0.11-2.src.rpm:1266441284
 mysql-mmm-2_1_0-1:HEAD:mysql-mmm-2.1.0-1.src.rpm:1266882781
+mysql-mmm-2_1_0-1_1:HEAD:mysql-mmm-2.1.0-1.1.src.rpm:1266897069


Index: mmm_mon_log.conf
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/mmm_mon_log.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mmm_mon_log.conf	11 Feb 2010 01:05:42 -0000	1.1
+++ mmm_mon_log.conf	23 Feb 2010 03:51:58 -0000	1.2
@@ -3,15 +3,11 @@ log4perl.logger = FATAL, MMMLog
 
 log4perl.appender.MMMLog = Log::Log4perl::Appender::File
 log4perl.appender.MMMLog.Threshold = INFO
-log4perl.appender.MMMLog.filename = /var/log/mysql-mmm/mmmd_mon.log
+log4perl.appender.MMMLog.filename = /var/log/mysql-mmm/mmm_mond.log
 log4perl.appender.MMMLog.recreate = 1
 log4perl.appender.MMMLog.layout = PatternLayout
 log4perl.appender.MMMLog.layout.ConversionPattern = %d %5p %m%n
 
-#
-# Uncomment and edit the following to send FATAL messages via email.  Must
-# also add MailFatal to the logger (first line up top).
-#
 #log4perl.appender.MailFatal = Log::Dispatch::Email::MailSender
 #log4perl.appender.MailFatal.Threshold = FATAL
 #log4perl.appender.MailFatal.from = mmm at example.com


Index: mysql-mmm-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/mysql-mmm-agent.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-mmm-agent.init	14 Dec 2009 19:44:24 -0000	1.1
+++ mysql-mmm-agent.init	23 Feb 2010 03:51:59 -0000	1.2
@@ -7,14 +7,14 @@
 # description:  MMM Agent.
 # processname: mmmd_agent
 # config: /etc/mysql-mmm/mmm_agent.conf
-# pidfile: /var/run/mysql-mmm/mmmd_agent.pid
+# pidfile: /var/run/mysql-mmm/mmm_agentd.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
 # Paths
-MMMD_AGENT_BIN="/usr/sbin/mmmd_agent"
-MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmmd_agent.pid"
+MMMD_AGENT_BIN="/usr/sbin/mmm_agentd"
+MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmm_agentd.pid"
 LOCKFILE='/var/lock/subsys/mysql-mmm-agent'
 prog='MMM Agent Daemon'
 


Index: mysql-mmm-monitor.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/mysql-mmm-monitor.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-mmm-monitor.init	14 Dec 2009 19:44:24 -0000	1.1
+++ mysql-mmm-monitor.init	23 Feb 2010 03:51:59 -0000	1.2
@@ -7,7 +7,7 @@
 # description:  MMM Monitor.
 # processname: mmmd_mon
 # config: /etc/mysql-mmm/mmm_mon.conf
-# pidfile: /var/run/mysql-mmm/mmmd_mon.pid
+# pidfile: /var/run/mysql-mmm/mmm_mond.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -18,11 +18,11 @@ LOCKFILE='/var/lock/subsys/mysql-mmm-mon
 prog='MMM Monitor Daemon'
 
 if [ "$CLUSTER" != "" ]; then
-    MMMD_MON_BIN="/usr/sbin/mmmd_mon @$CLUSTER"
-    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon-$CLUSTER.pid"
+    MMMD_MON_BIN="/usr/sbin/mmm_mond @$CLUSTER"
+    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond-$CLUSTER.pid"
 else 
     MMMD_MON_BIN="/usr/sbin/mmmd_mon"
-    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmmd_mon.pid"
+    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond.pid"
 fi
 
 


Index: mysql-mmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/mysql-mmm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mysql-mmm.spec	22 Feb 2010 23:53:34 -0000	1.4
+++ mysql-mmm.spec	23 Feb 2010 03:51:59 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name: mysql-mmm
 Version: 2.1.0
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 Summary: Multi-Master Replication Manager for MySQL
 License: GPLv2
 URL: http://mysql-mmm.org
@@ -12,13 +12,16 @@ Source2: http://mysql-mmm.org/_media/:mm
 Source3: mysql-mmm-agent.init
 Source4: mysql-mmm-monitor.init
 Source5: mmm_mon_log.conf 
+Source6: mmm_agent.conf
+Source7: mmm_mon.conf
+Source8: mmm_tools.conf
+Source9: mmm_common.conf
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
 BuildArch: noarch
 Provides: mmm = %{version}-%{release} 
 Provides: mysql-master-master = %{version}-%{release}
 
-Patch0: mysql-mmm-2.0.9-paths.patch
-Patch1: mysql-mmm-2.0.9-configs.patch 
+Patch0: mysql-mmm-2.1.0-paths.patch
 Patch4: mysql-mmm-2.0.10-default_logging.patch
 
 %description
@@ -79,7 +82,6 @@ EOF
 
 
 %patch0 -p1 
-%patch1 -p1
 %patch4 -p1
 
 
@@ -99,6 +101,15 @@ make install DESTDIR=%{buildroot}
 
 install -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm
 
+# Replace config files
+%{__rm} -f %{buildroot}%{_sysconfdir}/mysql-mmm/*.conf
+
+install -m 0640 %SOURCE5 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_mon_log.conf
+install -m 0640 %SOURCE6 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_agent.conf
+install -m 0640 %SOURCE7 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_mon.conf
+install -m 0640 %SOURCE8 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_tools.conf
+install -m 0640 %SOURCE9 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_common.conf
+
 # Replace our init scripts
 %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
 %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor
@@ -106,9 +117,6 @@ install -m 0644 %SOURCE1 %{buildroot}%{_
 install -m 0755 %SOURCE3 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
 install -m 0755 %SOURCE4 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor
 
-# Additional logs
-install -m 0640 %SOURCE5 %{buildroot}%{_sysconfdir}/%{name}/mmm_mon_log.conf
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -171,7 +179,7 @@ fi
 %attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-agent
 %{perl_vendorlib}/MMM/Agent
 %{_libexecdir}/mysql-mmm/agent/
-%{_sbindir}/mmmd_agent
+%{_sbindir}/mmm_agentd
 
 %files monitor
 %defattr(-,root,root,-)
@@ -181,13 +189,18 @@ fi
 %attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-monitor
 %{perl_vendorlib}/MMM/Monitor
 %{_libexecdir}/mysql-mmm/monitor/
-%{_sbindir}/mmmd_mon
+%{_sbindir}/mmm_mond
 %{_sbindir}/mmm_control
 
 
 %changelog
-* Mon Feb 22 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-1
+* Mon Feb 22 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-1.1
 - Latest sources from upstream
+- Updated init scripts to reflect new binary paths 
+  (i.e. mmmd_agent -> mmm_agentd)
+- Updated Patch0: mysql-mmm-2.1.0-paths.patch 
+- Removed Patch1: mysql-mmm-2.0.9-configs.patch (added source 
+  config files)
 
 * Wed Feb 17 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.0.11-2
 - Rebuild for F13/devel retag


--- mysql-mmm-2.0.9-configs.patch DELETED ---


--- mysql-mmm-2.0.9-paths.patch DELETED ---

