1
=== modified file 'actions.yaml'
2
--- actions.yaml	2015-08-06 13:45:33 +0000
3
+++ actions.yaml	2016-02-24 22:42:21 +0000
4
@@ -1,4 +1,20 @@
5
1
pause:
1
pause:
6
2
  description: Pause the MySQL service.
2
  description: Pause the MySQL service.
7
3
resume:
3
resume:
8
4
  description: Resume the MySQL service.
9
5
\ No newline at end of file
4
\ No newline at end of file
10
5
  description: Resume the MySQL service.
11
6
backup:
12
7
  description: Full database backup
13
8
  params:
14
9
    basedir:
15
10
      type: string
16
11
      default: "/opt/backups/mysql"
17
12
      description: The base directory for backups
18
13
    compress:
19
14
      type: boolean
20
15
      default: false
21
16
      description: Whether or not to compress the backup
22
17
    incremental:
23
18
      type: boolean
24
19
      default: false
25
20
      description: Make an incremental database backup
26
21
27
6
22
28
=== modified file 'actions/actions.py'
29
--- actions/actions.py	2015-10-10 16:19:59 +0000
30
+++ actions/actions.py	2016-02-24 22:42:21 +0000
31
@@ -2,12 +2,21 @@
32
2
2
33
3
import os
3
import os
34
4
import sys
4
import sys
35
5
import subprocess
36
6
import traceback
37
7
from time import gmtime, strftime
38
5
8
39
6
from charmhelpers.core.host import service_pause, service_resume
9
from charmhelpers.core.host import service_pause, service_resume
41
7
from charmhelpers.core.hookenv import action_fail, status_set
10
from charmhelpers.core.hookenv import (
42
11
    action_get,
43
12
    action_set,
44
13
    action_fail,
45
14
    status_set,
46
15
    config,
47
16
)
48
17
49
8
from percona_utils import assess_status
18
from percona_utils import assess_status
50
9
19
51
10
52
11
MYSQL_SERVICE = "mysql"
20
MYSQL_SERVICE = "mysql"
53
12
21
54
13
22
55
@@ -32,9 +41,45 @@
56
32
    assess_status()
41
    assess_status()
57
33
42
58
34
43
59
44
def backup():
60
45
    basedir = (action_get("basedir")).lower()
61
46
    compress = (action_get("compress"))
62
47
    incremental = (action_get("incremental"))
63
48
    sstpw = config("sst-password")
64
49
    optionlist = []
65
50
66
51
    # innobackupex will not create recursive dirs that do not already exist,
67
52
    # so help it along
68
53
    if not os.path.exists(basedir):
69
54
        os.makedirs(basedir)
70
55
71
56
    # Build a list of options to pass to innobackupex
72
57
    if compress is "true":
73
58
        optionlist.append("--compress")
74
59
75
60
    if incremental is "true":
76
61
        optionlist.append("--incremental")
77
62
78
63
    try:
79
64
        subprocess.check_call(
80
65
            ['innobackupex', '--compact', '--galera-info', '--rsync',
81
66
             basedir, '--user=sstuser', '--password=' + sstpw] + optionlist)
82
67
        action_set({
83
68
            'time-completed': (strftime("%Y-%m-%d %H:%M:%S", gmtime())),
84
69
            'outcome': 'Success'}
85
70
        )
86
71
    except subprocess.CalledProcessError as e:
87
72
        action_set({
88
73
            'time-completed': (strftime("%Y-%m-%d %H:%M:%S", gmtime())),
89
74
            'output': e.output,
90
75
            'return-code': e.returncode,
91
76
            'traceback': traceback.format_exc()})
92
77
        action_fail("innobackupex failed, you should log on to the unit"
93
78
                    "and check the status of the database")
94
79
95
35
# A dictionary of all the defined actions to callables (which take
80
# A dictionary of all the defined actions to callables (which take
96
36
# parsed arguments).
81
# parsed arguments).
98
37
ACTIONS = {"pause": pause, "resume": resume}
82
ACTIONS = {"pause": pause, "resume": resume, "backup": backup}
99
38
83
100
39
84
101
40
def main(args):
85
def main(args):
102
41
86
103
=== added symlink 'actions/backup'
104
=== target is u'actions.py'
Status:	Superseded
Proposed branch:	lp:~jillrouleau/charms/trusty/percona-cluster/add-backup-action
Merge into:	lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next
Diff against target:	104 lines (+65/-4) 2 files modified actions.yaml (+17/-1) actions/actions.py (+48/-3)
To merge this branch:	bzr merge lp:~jillrouleau/charms/trusty/percona-cluster/add-backup-action
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
James Page	2015-10-22	Needs Fixing on 2016-02-18
Billy Olsen	2015-09-10	Needs Fixing on 2015-09-22
Jorge Niedbalski (community)	2015-09-09	Approve on 2015-09-10
OpenStack Charmers	2015-12-23	Pending
Review via email: mp+270612@code.launchpad.net