From 10c82a72b538e7fb6e6043dd6f4e075254e51f66 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 18 Jul 2018 16:49:54 -0400 Subject: [PATCH] Restore message on unreachable collective member The parallel execution had broken how that message transmits. Bonus, make it a per node error. --- confluent_server/confluent/core.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py index eb6cdd85..50d2b32a 100644 --- a/confluent_server/confluent/core.py +++ b/confluent_server/confluent/core.py @@ -835,8 +835,10 @@ def dispatch_request(nodes, manager, element, configmanager, inputdata, keyfile='/etc/confluent/privkey.pem', certfile='/etc/confluent/srvcert.pem') except Exception: - raise exc.TargetEndpointUnreachable( - 'Collective member {0} is unreachable'.format(a['name'])) + for node in nodes: + yield msg.ConfluentResourceUnavailable( + node, 'Collective member {0} is unreachable'.format(a['name'])) + return if not util.cert_matches(a['fingerprint'], remote.getpeercert( binary_form=True)): raise Exception("Invalid certificate on peer")