x/timmy
Code Issues Proposed changes

Fix: scripts_all_pairs sometimes uses same node

Browse Source 
Change-Id: I4b1ce980514ecc0b77a229c9dcb878dac9db8079
(cherry picked from commit f292a9fccd572eb3231ce05cef54ef8a17e54307)
This commit is contained in:
Dmitry Sutyagin 2016-12-21 14:11:59 -08:00
parent 7fe14d4c23
commit a1243e2a5d
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
specs/python-timmy.spec
View File

@ -4,7 +4,7 @@
%global pypi_name timmy %global pypi_name timmy
Name: python-%{pypi_name} Name: python-%{pypi_name}
Version: 1.26.2 Version: 1.26.3
Release: 1%{?dist}~mos0 Release: 1%{?dist}~mos0
Summary: Log collector tool for OpenStack Fuel Summary: Log collector tool for OpenStack Fuel
@ -107,6 +107,9 @@ popd
%changelog %changelog
* Wed Dec 21 2016 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.3
- Fix: scripts_all_pairs sometimes uses same node
* Tue Dec 20 2016 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.2 * Tue Dec 20 2016 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.2
- Add: rabbitmq analysis module - Add: rabbitmq analysis module

2
timmy/env.py
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
project_name = 'timmy' project_name = 'timmy'
version = '1.26.2' version = '1.26.3'
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys

16
timmy/tools.py
View File

@ -425,14 +425,14 @@ def all_pairs(items, one_way=False):
for i in items_set: for i in items_set:
if items_set.difference(paired[i]) and i not in busy: if items_set.difference(paired[i]) and i not in busy:
can_pair = items_set.difference(busy).difference(paired[i]) can_pair = items_set.difference(busy).difference(paired[i])
if can_pair: if can_pair:
pair_i = can_pair.pop() pair_i = can_pair.pop()
current_pairs.append([i, pair_i]) current_pairs.append([i, pair_i])
busy.add(i) busy.add(i)
busy.add(pair_i) busy.add(pair_i)
paired[i].add(pair_i) paired[i].add(pair_i)
if one_way: if one_way:
paired[pair_i].add(i) paired[pair_i].add(i)
pairs.append(current_pairs) pairs.append(current_pairs)
return pairs return pairs