1
=== modified file 'hooks/swift_utils.py'
2
--- hooks/swift_utils.py	2015-03-26 18:37:57 +0000
3
+++ hooks/swift_utils.py	2015-07-30 23:13:39 +0000
4
@@ -398,13 +398,18 @@
5
398
    _write_ring(ring, path)
398
    _write_ring(ring, path)
6
399
399
7
400
400
9
401
def exists_in_ring(ring_path, node):
401
def exists_in_ring(ring_path, node, blockdev):
10
402
    ring = _load_builder(ring_path).to_dict()
402
    ring = _load_builder(ring_path).to_dict()
11
403
    node['port'] = ring_port(ring_path, node)
403
    node['port'] = ring_port(ring_path, node)
12
404
    # Make a nodecopy dict, to add a 'device' key for the purpose
13
405
    # of below comparison, as it doesn't have a single-valued 'device'
14
406
    # but a list as e.g. 'devices': ['sdb', 'sdc', ...]
15
407
    nodecopy = {k: v for k, v in node.items()}
16
408
    nodecopy['device'] = blockdev
17
404
409
18
405
    for dev in ring['devs']:
410
    for dev in ring['devs']:
21
406
        d = [(i, dev[i]) for i in dev if i in node and i != 'zone']
411
        d = [(i, dev[i]) for i in dev if i in nodecopy and i != 'zone']
22
407
        n = [(i, node[i]) for i in node if i in dev and i != 'zone']
412
        n = [(i, nodecopy[i]) for i in nodecopy if i in dev and i != 'zone']
23
408
        if sorted(d) == sorted(n):
413
        if sorted(d) == sorted(n):
24
409
414
25
410
            log('Node already exists in ring (%s).' % ring_path, level=INFO)
415
            log('Node already exists in ring (%s).' % ring_path, level=INFO)
26
@@ -812,10 +817,10 @@
27
812
                        balance_required = True
817
                        balance_required = True
28
813
818
29
814
    if node_settings:
819
    if node_settings:
31
815
        for dev in node_settings.get('devices', []):
820
        for blockdev in node_settings.get('devices', []):
32
816
            for ring in SWIFT_RINGS.itervalues():
821
            for ring in SWIFT_RINGS.itervalues():
35
817
                if not exists_in_ring(ring, node_settings):
822
                if not exists_in_ring(ring, node_settings, blockdev):
36
818
                    add_to_ring(ring, node_settings, dev)
823
                    add_to_ring(ring, node_settings, blockdev)
37
819
                    balance_required = True
824
                    balance_required = True
38
820
825
39
821
    if balance_required:
826
    if balance_required:
40
822
827
41
=== modified file 'unit_tests/test_swift_utils.py'
42
--- unit_tests/test_swift_utils.py	2014-12-18 11:58:28 +0000
43
+++ unit_tests/test_swift_utils.py	2015-07-30 23:13:39 +0000
44
@@ -76,6 +76,77 @@
45
76
        self.assertTrue(mock_set_min_hours.called)
76
        self.assertTrue(mock_set_min_hours.called)
46
77
        self.assertTrue(mock_balance_rings.called)
77
        self.assertTrue(mock_balance_rings.called)
47
78
78
48
79
    @mock.patch('swift_utils._load_builder')
49
80
    @mock.patch('swift_utils.initialize_ring')
50
81
    @mock.patch('swift_utils.get_broker_token')
51
82
    @mock.patch('swift_utils.update_www_rings')
52
83
    @mock.patch('swift_utils.get_builders_checksum')
53
84
    @mock.patch('swift_utils.get_rings_checksum')
54
85
    @mock.patch('swift_utils.balance_rings')
55
86
    @mock.patch('swift_utils.log')
56
87
    @mock.patch('swift_utils.is_elected_leader')
57
88
    def test_update_rings_multiple_devs(self,
58
89
                                        mock_is_elected_leader,
59
90
                                        mock_log, mock_balance_rings,
60
91
                                        mock_get_rings_checksum,
61
92
                                        mock_get_builders_checksum,
62
93
                                        mock_update_www_rings,
63
94
                                        mock_get_broker_token,
64
95
                                        mock_initialize_ring,
65
96
                                        mock_load_builder,
66
97
                                        ):
67
98
        # To avoid the need for swift.common.ring library, mock a basic
68
99
        # rings dictionary, keyed by path.
69
100
        # Each ring has enough logic to hold a dictionary with a single 'devs'
70
101
        # key, which stores the list of passed dev(s) by add_dev().
71
102
        #
72
103
        # If swift (actual) ring representation diverges (see _load_builder),
73
104
        # this mock will need to be adapted.
74
105
        mock_rings = {}
75
106
76
107
        def mock_load_builder_fn(path):
77
108
            class mock_ring(object):
78
109
                def __init__(self, path):
79
110
                    self.path = path
80
111
81
112
                def to_dict(self):
82
113
                    return mock_rings[self.path]
83
114
84
115
                def add_dev(self, dev):
85
116
                    mock_rings[self.path]['devs'].append(dev)
86
117
            return mock_ring(path)
87
118
88
119
        def mock_initialize_ring_fn(path, *args):
89
120
            mock_rings.setdefault(path, {'devs': []})
90
121
91
122
        mock_load_builder.side_effect = mock_load_builder_fn
92
123
        mock_initialize_ring.side_effect = mock_initialize_ring_fn
93
124
94
125
        init_ring_paths(tempfile.mkdtemp())
95
126
        devices = ['sdb', 'sdc']
96
127
        node_settings = {
97
128
            'object_port': 6000,
98
129
            'container_port': 6001,
99
130
            'account_port': 6002,
100
131
            'zone': 1,
101
132
            'ip': '1.2.3.4',
102
133
            'devices': devices
103
134
        }
104
135
        for path in swift_utils.SWIFT_RINGS.itervalues():
105
136
            swift_utils.initialize_ring(path, 8, 3, 0)
106
137
107
138
        # verify all devices added to each ring
108
139
        swift_utils.update_rings(node_settings)
109
140
        for path in swift_utils.SWIFT_RINGS.itervalues():
110
141
            devs = swift_utils._load_builder(path).to_dict()['devs']
111
142
            added_devices = [dev['device'] for dev in devs]
112
143
            self.assertEqual(devices, added_devices)
113
144
114
145
        # try re-adding, assert add_to_ring was not called
115
146
        with mock.patch('swift_utils.add_to_ring') as mock_add_to_ring:
116
147
            swift_utils.update_rings(node_settings)
117
148
            self.assertFalse(mock_add_to_ring.called)
118
149
119
79
    @mock.patch('swift_utils.get_broker_token')
150
    @mock.patch('swift_utils.get_broker_token')
120
80
    @mock.patch('swift_utils.balance_rings')
151
    @mock.patch('swift_utils.balance_rings')
121
81
    @mock.patch('swift_utils.log')
152
    @mock.patch('swift_utils.log')
Reviewer	Review Type	Date Requested	Status
OpenStack Charmers		2015-07-30	Pending
Review via email: mp+266462@code.launchpad.net