Просмотр исходного кода

HUE-7016 [libsentry] HA retry on SOLR component does not set the component value

Romain Rigaux 8 лет назад
Родитель
Сommit
d6597d76bb

+ 1 - 1
desktop/libs/libsentry/src/libsentry/api2.py

@@ -44,7 +44,7 @@ def ha_error_handler(func):
         raise PopupException(_('Failed to connect to Sentry server %s, and Sentry HA is not enabled.') % args[0].client.host, detail=e)
       else:
         LOG.warn("Failed to connect to Sentry server %s, will attempt to find next available host." % args[0].client.host)
-        server, attempts = get_next_available_server(SentryClient, args[0].client.username, args[0].client.host)
+        server, attempts = get_next_available_server(client_class=SentryClient, username=args[0].client.username, failed_host=args[0].client.host, component=args[0].client.component)
         if server is not None:
           args[0].client = create_client(SentryClient, args[0].client.username, server, args[0].client.component)
           set_api_cache(server)

+ 1 - 1
desktop/libs/libsentry/src/libsentry/sentry_ha.py

@@ -24,7 +24,7 @@ from desktop.lib.exceptions import StructuredThriftTransportException
 from desktop.lib.exceptions_renderable import PopupException
 
 from libsentry.client2 import SentryClient
-from libsentry.sentry_site import get_sentry_server, is_ha_enabled
+from libsentry.sentry_site import get_sentry_server
 
 
 LOG = logging.getLogger(__name__)