Yair Zaslavsky has uploaded a new change for review. Change subject: core: Engine is sending bad credentials repeatdely ......................................................................
core: Engine is sending bad credentials repeatdely In some errors (like wrong credentials) engine should not try to work with the next ldap server, unfortunately this information (that it should not try the next ldap server) is only logged , and it continues to the next ldap server https://bugzilla.redhat.com/show_bug.cgi?id=1085529 Change-Id: I9c04d586a776b469f0e619d3ea0ff844ea07a357 Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java 1 file changed, 13 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/26664/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java index a3ed7c5..7728f3a 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java @@ -82,16 +82,24 @@ for (Iterator<URI> iterator = ldapServerURIs.iterator(); iterator.hasNext();) { URI ldapURI = iterator.next(); - response = findAndOrderServers(queryData, ldapURI, domainName, resultCount, editableLdapServerURIs); - if (response != null) { - break; + try { + response = findAndOrderServers(queryData, ldapURI, domainName, resultCount, editableLdapServerURIs); + if (response != null) { + break; + } + } catch (Exception ex) { + return null; } } domain.setLdapServers(editableLdapServerURIs); return response; } - private List<?> findAndOrderServers(LdapQueryData queryData, URI ldapURI, String domainName, long resultCount, List<URI> modifiedLdapServersURIs) { + private List<?> findAndOrderServers(LdapQueryData queryData, + URI ldapURI, + String domainName, + long resultCount, + List<URI> modifiedLdapServersURIs) throws Exception { if (log.isDebugEnabled()) { log.debug("Using Ldap server " + ldapURI); } @@ -133,7 +141,7 @@ translatedException, handlingResponse.isTryNextServer() ? "should" : "should not"); if (!handlingResponse.isTryNextServer()) { - return null; + throw new Exception(); } } return null; -- To view, visit http://gerrit.ovirt.org/26664 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c04d586a776b469f0e619d3ea0ff844ea07a357 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
