Attachment 933837 Details for Bug 1136456 – ricci_helpers.py: Do not activate new configuration if sync failed to any node

[patch] ricci_helpers.py: Do not activate new configuration if sync failed to any node

case1182877-luci_catch_cluster_conf_sync_failures.patch (text/plain), 1.32 KB, created by John Ruemker on 2014-09-02 15:47:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Ruemker

Created: 2014-09-02 15:47:48 UTC

Size: 1.32 KB

patch

obsolete

>diff -up luci-0.26.0/luci/controllers/cluster.py.case1182877 luci-0.26.0/luci/controllers/cluster.py
>diff -up luci-0.26.0/luci/lib/ricci_helpers.py.case1182877 luci-0.26.0/luci/lib/ricci_helpers.py
>--- luci-0.26.0/luci/lib/ricci_helpers.py.case1182877	2014-08-31 17:20:37.796588368 -0400
>+++ luci-0.26.0/luci/lib/ricci_helpers.py	2014-08-31 17:42:39.289758013 -0400
>@@ -141,6 +141,7 @@ def update_cluster_conf(cluster_model, n
>                 % cluster_name)
>             return False
> 
>+        sync_err = False
>         for i in ret.keys():
>             try:
>                 batch_status = ret[i].get('batch_result')
>@@ -158,10 +159,15 @@ def update_cluster_conf(cluster_model, n
>                     if ret[i].get('error'):
>                         log.error('Error retrieving batch number from %s: %s' %
>                             (i, ret[i].get('err_msg')))
>+                        sync_err = True
>             except Exception, e:
>                 log.exception('Unable to retrieve the batch number from %s' % i)
>+                sync_err = True
>                 continue
> 
>+        if not sync_err:
>+            return False
>+
>         # Activate the new config we just set
>         new_version = cluster_model.getClusterConfigVersion()
>         host_triples = prepare_host_triples(cluster_obj, node_list, rq.setClusterVersion, new_version)

Actions: View | Diff

Attachments on bug 1136456: 933837 | 1005983