Repository: incubator-guacamole-client Updated Branches: refs/heads/master 728d9b937 -> 18effb247
GUACAMOLE-317: Use failover-only connections for failover only. Do not balance to failover-only connections unless an upstream failure has occurred. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/1b35d437 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/1b35d437 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/1b35d437 Branch: refs/heads/master Commit: 1b35d437836a6cf3b1488420477fd7ffb6aaaa32 Parents: 3e5c2ba Author: Michael Jumper <[email protected]> Authored: Tue Jun 6 15:52:55 2017 -0700 Committer: Michael Jumper <[email protected]> Committed: Tue Jun 6 17:32:38 2017 -0700 ---------------------------------------------------------------------- .../tunnel/AbstractGuacamoleTunnelService.java | 29 ++++++++++++++++---- .../RestrictedGuacamoleTunnelService.java | 17 +++++------- 2 files changed, 30 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1b35d437/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java index 392d019..4054333 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java @@ -44,7 +44,6 @@ import org.apache.guacamole.GuacamoleResourceNotFoundException; import org.apache.guacamole.GuacamoleSecurityException; import org.apache.guacamole.GuacamoleServerException; import org.apache.guacamole.GuacamoleUpstreamException; -import org.apache.guacamole.auth.jdbc.JDBCEnvironment; import org.apache.guacamole.auth.jdbc.connection.ConnectionMapper; import org.apache.guacamole.net.GuacamoleSocket; import org.apache.guacamole.net.GuacamoleTunnel; @@ -143,6 +142,10 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS * @param connections * The connections being accessed. * + * @param includeFailoverOnly + * Whether connections which have been designated for use in failover + * situations only (hot spares) may be considered. + * * @return * The connection that has been acquired on behalf of the given user. * @@ -150,7 +153,8 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS * If access is denied to the given user for any reason. */ protected abstract ModeledConnection acquire(RemoteAuthenticatedUser user, - List<ModeledConnection> connections) throws GuacamoleException; + List<ModeledConnection> connections, boolean includeFailoverOnly) + throws GuacamoleException; /** * Releases possibly-exclusive access to the given connection on behalf of @@ -647,8 +651,8 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS final ModeledConnection connection, GuacamoleClientInformation info) throws GuacamoleException { - // Acquire access to single connection - acquire(user, Collections.singletonList(connection)); + // Acquire access to single connection, ignoring the failover-only flag + acquire(user, Collections.singletonList(connection), true); // Connect only if the connection was successfully acquired ActiveConnectionRecord connectionRecord = activeConnectionRecordProvider.get(); @@ -668,6 +672,9 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS ModeledConnectionGroup connectionGroup, GuacamoleClientInformation info) throws GuacamoleException { + // Track failures in upstream (remote desktop) connections + boolean upstreamHasFailed = false; + // If group has no associated balanced connections, cannot connect List<ModeledConnection> connections = getBalancedConnections(user, connectionGroup); if (connections.isEmpty()) @@ -678,10 +685,11 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS // Acquire group acquire(user, connectionGroup); - // Attempt to acquire to any child + // Attempt to acquire to any child, including failover-only + // connections only if at least one upstream failure has occurred ModeledConnection connection; try { - connection = acquire(user, connections); + connection = acquire(user, connections, upstreamHasFailed); } // Ensure connection group is always released if child acquire fails @@ -701,6 +709,14 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS if (connectionGroup.isSessionAffinityEnabled()) user.preferConnection(connection.getIdentifier()); + // Warn if we are connecting to a failover-only connection + if (connection.isFailoverOnly()) + logger.warn("One or more normal connections within " + + "group \"{}\" have failed. Some connection " + + "attempts are being routed to designated " + + "failover-only connections.", + connectionGroup.getIdentifier()); + return tunnel; } @@ -711,6 +727,7 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS logger.info("Upstream error intercepted for connection \"{}\". Failing over to next connection in group...", connection.getIdentifier()); logger.debug("Upstream remote desktop reported an error during connection.", e); connections.remove(connection); + upstreamHasFailed = true; } } while (!connections.isEmpty()); http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/1b35d437/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java index 19a625a..a5d509b 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java @@ -171,7 +171,8 @@ public class RestrictedGuacamoleTunnelService @Override protected ModeledConnection acquire(RemoteAuthenticatedUser user, - List<ModeledConnection> connections) throws GuacamoleException { + List<ModeledConnection> connections, boolean includeFailoverOnly) + throws GuacamoleException { // Do not acquire connection unless within overall limits if (!tryIncrement(totalActiveConnections, environment.getAbsoluteMaxConnections())) @@ -187,15 +188,6 @@ public class RestrictedGuacamoleTunnelService @Override public int compare(ModeledConnection a, ModeledConnection b) { - // Always prefer non-failover connections to those which are - // failover-only - if (a.isFailoverOnly()) { - if (!b.isFailoverOnly()) - return 1; - } - else if (b.isFailoverOnly()) - return -1; - // Active connections int connA = getActiveConnections(a).size(); int connB = getActiveConnections(b).size(); @@ -231,6 +223,11 @@ public class RestrictedGuacamoleTunnelService continue; } + // Skip connections which are failover-only if they are excluded + // from this connection attempt + if (!includeFailoverOnly && connection.isFailoverOnly()) + continue; + // Attempt to aquire connection according to per-user limits Seat seat = new Seat(username, connection.getIdentifier()); if (tryAdd(activeSeats, seat,
