1
=== modified file 'hooks/swift_storage_hooks.py'
2
--- hooks/swift_storage_hooks.py	2015-07-17 09:57:19 +0000
3
+++ hooks/swift_storage_hooks.py	2015-09-02 10:52:42 +0000
4
@@ -18,6 +18,8 @@
5
18
    setup_rsync,
18
    setup_rsync,
6
19
)
19
)
7
20
20
8
21
from lib.misc_utils import pause_aware_restart_on_change
9
22
10
21
from charmhelpers.core.hookenv import (
23
from charmhelpers.core.hookenv import (
11
22
    Hooks, UnregisteredHookError,
24
    Hooks, UnregisteredHookError,
12
23
    config,
25
    config,
13
@@ -32,7 +34,7 @@
14
32
    apt_update,
34
    apt_update,
15
33
    filter_installed_packages
35
    filter_installed_packages
16
34
)
36
)
18
35
from charmhelpers.core.host import restart_on_change, rsync
37
from charmhelpers.core.host import rsync
19
36
from charmhelpers.payload.execd import execd_preinstall
38
from charmhelpers.payload.execd import execd_preinstall
20
37
39
21
38
from charmhelpers.contrib.openstack.utils import (
40
from charmhelpers.contrib.openstack.utils import (
22
@@ -63,7 +65,7 @@
23
63
65
24
64
66
25
65
@hooks.hook('config-changed')
67
@hooks.hook('config-changed')
27
66
@restart_on_change(RESTART_MAP)
68
@pause_aware_restart_on_change(RESTART_MAP)
28
67
def config_changed():
69
def config_changed():
29
68
    if config('prefer-ipv6'):
70
    if config('prefer-ipv6'):
30
69
        assert_charm_supports_ipv6()
71
        assert_charm_supports_ipv6()
31
@@ -104,7 +106,7 @@
32
104
106
33
105
107
34
106
@hooks.hook('swift-storage-relation-changed')
108
@hooks.hook('swift-storage-relation-changed')
36
107
@restart_on_change(RESTART_MAP)
109
@pause_aware_restart_on_change(RESTART_MAP)
37
108
def swift_storage_relation_changed():
110
def swift_storage_relation_changed():
38
109
    rings_url = relation_get('rings_url')
111
    rings_url = relation_get('rings_url')
39
110
    swift_hash = relation_get('swift_hash')
112
    swift_hash = relation_get('swift_hash')
40
111
113
41
=== modified file 'lib/misc_utils.py'
42
--- lib/misc_utils.py	2015-07-17 10:51:25 +0000
43
+++ lib/misc_utils.py	2015-09-02 10:52:42 +0000
44
@@ -16,12 +16,14 @@
45
16
from charmhelpers.core.host import (
16
from charmhelpers.core.host import (
46
17
    mounts,
17
    mounts,
47
18
    umount,
18
    umount,
48
19
    restart_on_change,
49
19
)
20
)
50
20
21
51
21
from charmhelpers.core.hookenv import (
22
from charmhelpers.core.hookenv import (
52
22
    log,
23
    log,
53
23
    INFO,
24
    INFO,
54
24
    ERROR,
25
    ERROR,
55
26
    status_get,
56
25
)
27
)
57
26
28
58
27
DEFAULT_LOOPBACK_SIZE = '5G'
29
DEFAULT_LOOPBACK_SIZE = '5G'
59
@@ -83,3 +85,19 @@
60
83
        remove_lvm_physical_volume(block_device)
85
        remove_lvm_physical_volume(block_device)
61
84
    else:
86
    else:
62
85
        zap_disk(block_device)
87
        zap_disk(block_device)
63
88
64
89
65
90
def is_paused(status_get=status_get):
66
91
    """Is the unit paused?"""
67
92
    status, message = status_get()
68
93
    return status == "maintenance" and message.startswith("Paused")
69
94
70
95
71
96
def pause_aware_restart_on_change(restart_map):
72
97
    """Avoids restarting services if config changes when unit is paused."""
73
98
    def wrapper(f):
74
99
        if is_paused():
75
100
            return f
76
101
        else:
77
102
            return restart_on_change(restart_map)(f)
78
103
    return wrapper
79
86
104
80
=== modified file 'lib/swift_storage_utils.py'
81
--- lib/swift_storage_utils.py	2015-08-11 13:59:31 +0000
82
+++ lib/swift_storage_utils.py	2015-09-02 10:52:42 +0000
83
@@ -10,6 +10,7 @@
84
10
from misc_utils import (
10
from misc_utils import (
85
11
    ensure_block_device,
11
    ensure_block_device,
86
12
    clean_storage,
12
    clean_storage,
87
13
    is_paused
88
13
)
14
)
89
14
15
90
15
from swift_storage_context import (
16
from swift_storage_context import (
91
@@ -151,8 +152,9 @@
92
151
    apt_upgrade(options=dpkg_opts, fatal=True, dist=True)
152
    apt_upgrade(options=dpkg_opts, fatal=True, dist=True)
93
152
    configs.set_release(openstack_release=new_os_rel)
153
    configs.set_release(openstack_release=new_os_rel)
94
153
    configs.write_all()
154
    configs.write_all()
97
154
    [service_restart(svc) for svc in
155
    if not is_paused():
98
155
     (ACCOUNT_SVCS + CONTAINER_SVCS + OBJECT_SVCS)]
156
        for service in SWIFT_SVCS:
99
157
            service_restart(service)
100
156
158
101
157
159
102
158
def _is_storage_ready(partition):
160
def _is_storage_ready(partition):
103
159
161
104
=== modified file 'tests/basic_deployment.py'
105
--- tests/basic_deployment.py	2015-09-02 10:52:42 +0000
106
+++ tests/basic_deployment.py	2015-09-02 10:52:42 +0000
107
@@ -501,3 +501,51 @@
108
501
        u.log.debug('Checking pause/resume actions...')
501
        u.log.debug('Checking pause/resume actions...')
109
502
        self._test_pause()
502
        self._test_pause()
110
503
        self._test_resume()
503
        self._test_resume()
111
504
112
505
    def test_920_no_restart_on_config_change_when_paused(self):
113
506
        """Verify that the specified services are not restarted when the config
114
507
           is changed and the unit is paused."""
115
508
        u.log.info('Checking that system services do not get restarted  '
116
509
                   'when charm config changes but unit is paused...')
117
510
        sentry = self.swift_storage_sentry
118
511
        juju_service = 'swift-storage'
119
512
120
513
        # Expected default and alternate values
121
514
        set_default = {'object-server-threads-per-disk': '4'}
122
515
        set_alternate = {'object-server-threads-per-disk': '2'}
123
516
124
517
        services = ['swift-account-server',
125
518
                    'swift-account-auditor',
126
519
                    'swift-account-reaper',
127
520
                    'swift-account-replicator',
128
521
                    'swift-container-server',
129
522
                    'swift-container-auditor',
130
523
                    'swift-container-replicator',
131
524
                    'swift-container-updater',
132
525
                    'swift-object-server',
133
526
                    'swift-object-auditor',
134
527
                    'swift-object-replicator',
135
528
                    'swift-object-updater',
136
529
                    'swift-container-sync']
137
530
        if self._get_openstack_release() < self.precise_icehouse:
138
531
            services.remove('swift-container-sync')
139
532
140
533
        # Pause the unit
141
534
        u.log.debug('Pausing the unit...')
142
535
        pause_action_id = u.run_action(sentry, "pause")
143
536
        assert u.wait_on_action(pause_action_id), "Pause action failed."
144
537
145
538
        # Make config change, check for service restarts
146
539
        u.log.debug('Making config change on {}...'.format(juju_service))
147
540
        self.d.configure(juju_service, set_alternate)
148
541
149
542
        for service in services:
150
543
            u.log.debug("Checking that service didn't start while "
151
544
                        "paused: {}".format(service))
152
545
            # No explicit assert because get_process_id_list will do it for us
153
546
            u.get_process_id_list(
154
547
                sentry, service, expect_success=False)
155
548
156
549
        self.d.configure(juju_service, set_default)
157
550
        resume_action_id = u.run_action(sentry, "resume")
158
551
        assert u.wait_on_action(resume_action_id), "Resume action failed."
Reviewer	Date Requested	Status
Liam Young (community)	2015-09-02	Approve on 2015-09-07
Alberto Donato (community)	2015-09-02	Approve on 2015-09-02
Review via email: mp+269860@code.launchpad.net