You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2017/06/16 01:08:31 UTC
[1/7] incubator-guacamole-client git commit: GUACAMOLE-317: Use
failover-only connections for failover only. Do not balance to failover-only
connections unless an upstream failure has occurred.
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 <mj...@apache.org>
Authored: Tue Jun 6 15:52:55 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
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,
[4/7] incubator-guacamole-client git commit: GUACAMOLE-317: Always
prefer non-failover connections relative to failover-only connections.
Posted by vn...@apache.org.
GUACAMOLE-317: Always prefer non-failover connections relative to failover-only connections.
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/3e5c2ba8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/3e5c2ba8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/3e5c2ba8
Branch: refs/heads/master
Commit: 3e5c2ba8d8e56282aa679a21f23cb73302d1712d
Parents: cdf823c
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jun 6 13:37:16 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jun 6 17:32:38 2017 -0700
----------------------------------------------------------------------
.../auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3e5c2ba8/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 fa2c99f..19a625a 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
@@ -187,6 +187,15 @@ 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();
[3/7] incubator-guacamole-client git commit: GUACAMOLE-317: Add
"failover_only" column to database schema for Guacamole connections.
Posted by vn...@apache.org.
GUACAMOLE-317: Add "failover_only" column to database schema for Guacamole connections.
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/3c553b96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/3c553b96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/3c553b96
Branch: refs/heads/master
Commit: 3c553b965c1d089feb91eb192090418ac6165b24
Parents: eb087ae
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jun 6 13:29:22 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jun 6 17:32:38 2017 -0700
----------------------------------------------------------------------
.../auth/jdbc/connection/ConnectionModel.java | 33 ++++++++++++++++++++
.../schema/001-create-schema.sql | 4 +--
.../schema/upgrade/upgrade-pre-0.9.14.sql | 7 +++++
.../auth/jdbc/connection/ConnectionMapper.xml | 17 +++++++---
.../schema/001-create-schema.sql | 1 +
.../schema/upgrade/upgrade-pre-0.9.14.sql | 7 +++++
.../auth/jdbc/connection/ConnectionMapper.xml | 19 +++++++----
7 files changed, 75 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3c553b96/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java
index 78cc885..788daa1 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java
@@ -62,6 +62,13 @@ public class ConnectionModel extends ChildObjectModel {
private Integer connectionWeight;
/**
+ * Whether this connection should be reserved for failover. Failover-only
+ * connections within a balancing group are only used when all non-failover
+ * connections are unavailable.
+ */
+ private boolean failoverOnly;
+
+ /**
* The identifiers of all readable sharing profiles associated with this
* connection.
*/
@@ -197,6 +204,32 @@ public class ConnectionModel extends ChildObjectModel {
}
/**
+ * Returns whether this connection should be reserved for failover.
+ * Failover-only connections within a balancing group are only used when
+ * all non-failover connections are unavailable.
+ *
+ * @return
+ * true if this connection should be reserved for failover, false
+ * otherwise.
+ */
+ public boolean isFailoverOnly() {
+ return failoverOnly;
+ }
+
+ /**
+ * Sets whether this connection should be reserved for failover.
+ * Failover-only connections within a balancing group are only used when
+ * all non-failover connections are unavailable.
+ *
+ * @param failoverOnly
+ * true if this connection should be reserved for failover, false
+ * otherwise.
+ */
+ public void setFailoverOnly(boolean failoverOnly) {
+ this.failoverOnly = failoverOnly;
+ }
+
+ /**
* Sets the maximum number of connections that can be established to this
* connection concurrently by any one user.
*
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3c553b96/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
index 2f0aa73..515ea72 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
@@ -65,9 +65,9 @@ CREATE TABLE `guacamole_connection` (
`max_connections` int(11),
`max_connections_per_user` int(11),
- -- Connection weight
+ -- Load-balancing behavior
`connection_weight` int(11),
-
+ `failover_only` boolean NOT NULL DEFAULT 0,
PRIMARY KEY (`connection_id`),
UNIQUE KEY `connection_name_parent` (`connection_name`, `parent_id`),
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3c553b96/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.14.sql
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.14.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.14.sql
index 2b14e27..14a016b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.14.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.14.sql
@@ -23,3 +23,10 @@
ALTER TABLE guacamole_connection
ADD COLUMN connection_weight int(11);
+
+--
+-- Add failover-only flag
+--
+
+ALTER TABLE guacamole_connection
+ ADD COLUMN failover_only BOOLEAN NOT NULL DEFAULT 0;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3c553b96/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
index 2f778fa..03ffa43 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
@@ -38,6 +38,7 @@
<result column="proxy_encryption_method" property="proxyEncryptionMethod" jdbcType="VARCHAR"
javaType="org.apache.guacamole.net.auth.GuacamoleProxyConfiguration$EncryptionMethod"/>
<result column="connection_weight" property="connectionWeight" jdbcType="INTEGER"/>
+ <result column="failover_only" property="failoverOnly" jdbcType="BOOLEAN"/>
<!-- Associated sharing profiles -->
<collection property="sharingProfileIdentifiers" resultSet="sharingProfiles" ofType="java.lang.String"
@@ -97,7 +98,8 @@
proxy_hostname,
proxy_port,
proxy_encryption_method,
- connection_weight
+ connection_weight,
+ failover_only
FROM guacamole_connection
WHERE connection_id IN
<foreach collection="identifiers" item="identifier"
@@ -129,7 +131,8 @@
proxy_hostname,
proxy_port,
proxy_encryption_method,
- connection_weight
+ connection_weight,
+ failover_only
FROM guacamole_connection
JOIN guacamole_connection_permission ON guacamole_connection_permission.connection_id = guacamole_connection.connection_id
WHERE guacamole_connection.connection_id IN
@@ -166,7 +169,8 @@
proxy_hostname,
proxy_port,
proxy_encryption_method,
- connection_weight
+ connection_weight,
+ failover_only
FROM guacamole_connection
WHERE
<if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=VARCHAR}</if>
@@ -194,7 +198,8 @@
proxy_hostname,
proxy_port,
proxy_encryption_method,
- connection_weight
+ connection_weight,
+ failover_only
)
VALUES (
#{object.name,jdbcType=VARCHAR},
@@ -205,7 +210,8 @@
#{object.proxyHostname,jdbcType=VARCHAR},
#{object.proxyPort,jdbcType=INTEGER},
#{object.proxyEncryptionMethod,jdbcType=VARCHAR},
- #{object.connectionWeight,jdbcType=INTEGER}
+ #{object.connectionWeight,jdbcType=INTEGER},
+ #{object.failoverOnly,jdbcType=BOOLEAN}
)
</insert>
@@ -222,6 +228,7 @@
proxy_port = #{object.proxyPort,jdbcType=INTEGER},
proxy_encryption_method = #{object.proxyEncryptionMethod,jdbcType=VARCHAR},
connection_weight = #{object.connectionWeight,jdbcType=INTEGER}
+ failover_only = #{object.failoverOnly,jdbcType=BOOLEAN}
WHERE connection_id = #{object.objectID,jdbcType=INTEGER}
</update>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3c553b96/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
index 7b9081e..d1b5bf5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
@@ -108,6 +108,7 @@ CREATE TABLE guacamole_connection (
-- Connection Weight
connection_weight integer,
+ failover_only boolean NOT NULL DEFAULT FALSE,
-- Guacamole proxy (guacd) overrides
proxy_port integer,
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3c553b96/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.14.sql
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.14.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.14.sql
index 6388b44..20882ed 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.14.sql
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.14.sql
@@ -23,3 +23,10 @@
ALTER TABLE guacamole_connection
ADD COLUMN connection_weight int;
+
+--
+-- Add failover-only flag
+--
+
+ALTER TABLE guacamole_connection
+ ADD COLUMN failover_only BOOLEAN NOT NULL DEFAULT FALSE;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3c553b96/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
index f53e439..dd9265d 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
@@ -38,6 +38,7 @@
<result column="proxy_encryption_method" property="proxyEncryptionMethod" jdbcType="VARCHAR"
javaType="org.apache.guacamole.net.auth.GuacamoleProxyConfiguration$EncryptionMethod"/>
<result column="connection_weight" property="connectionWeight" jdbcType="INTEGER"/>
+ <result column="failover_only" property="failoverOnly" jdbcType="BOOLEAN"/>
<!-- Associated sharing profiles -->
<collection property="sharingProfileIdentifiers" resultSet="sharingProfiles" ofType="java.lang.String"
@@ -97,7 +98,8 @@
proxy_hostname,
proxy_port,
proxy_encryption_method,
- connection_weight
+ connection_weight,
+ failover_only
FROM guacamole_connection
WHERE connection_id IN
<foreach collection="identifiers" item="identifier"
@@ -129,7 +131,8 @@
proxy_hostname,
proxy_port,
proxy_encryption_method,
- connection_weight
+ connection_weight,
+ failover_only
FROM guacamole_connection
JOIN guacamole_connection_permission ON guacamole_connection_permission.connection_id = guacamole_connection.connection_id
WHERE guacamole_connection.connection_id IN
@@ -166,7 +169,8 @@
proxy_hostname,
proxy_port,
proxy_encryption_method,
- connection_weight
+ connection_weight,
+ failover_only
FROM guacamole_connection
WHERE
<if test="parentIdentifier != null">parent_id = #{parentIdentifier,jdbcType=INTEGER}::integer</if>
@@ -194,7 +198,8 @@
proxy_hostname,
proxy_port,
proxy_encryption_method,
- connection_weight
+ connection_weight,
+ failover_only
)
VALUES (
#{object.name,jdbcType=VARCHAR},
@@ -205,7 +210,8 @@
#{object.proxyHostname,jdbcType=VARCHAR},
#{object.proxyPort,jdbcType=INTEGER},
#{object.proxyEncryptionMethod,jdbcType=VARCHAR}::guacamole_proxy_encryption_method,
- #{object.connectionWeight,jdbcType=INTEGER}
+ #{object.connectionWeight,jdbcType=INTEGER},
+ #{object.failoverOnly,jdbcType=BOOLEAN}
)
</insert>
@@ -221,7 +227,8 @@
proxy_hostname = #{object.proxyHostname,jdbcType=VARCHAR},
proxy_port = #{object.proxyPort,jdbcType=INTEGER},
proxy_encryption_method = #{object.proxyEncryptionMethod,jdbcType=VARCHAR}::guacamole_proxy_encryption_method,
- connection_weight = #{object.connectionWeight,jdbcType=INTEGER}
+ connection_weight = #{object.connectionWeight,jdbcType=INTEGER},
+ failover_only = #{object.failoverOnly,jdbcType=BOOLEAN}
WHERE connection_id = #{object.objectID,jdbcType=INTEGER}::integer
</update>
[2/7] incubator-guacamole-client git commit: GUACAMOLE-317: Expose
"failover-only" attribute for connections.
Posted by vn...@apache.org.
GUACAMOLE-317: Expose "failover-only" attribute for connections.
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/31519061
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/31519061
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/31519061
Branch: refs/heads/master
Commit: 31519061dc8eacc6efd7fb8a3a02c7ecc1bfb37e
Parents: 3c553b9
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jun 6 13:31:29 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jun 6 17:32:38 2017 -0700
----------------------------------------------------------------------
.../auth/jdbc/connection/ModeledConnection.java | 17 ++++++++++++++++-
.../src/main/resources/translations/en.json | 1 +
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/31519061/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
index 3d6e625..e2cafe1 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
@@ -32,6 +32,7 @@ import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
import org.apache.guacamole.auth.jdbc.base.ModeledChildDirectoryObject;
+import org.apache.guacamole.form.BooleanField;
import org.apache.guacamole.form.EnumField;
import org.apache.guacamole.form.Field;
import org.apache.guacamole.form.Form;
@@ -122,6 +123,13 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
public static final String CONNECTION_WEIGHT = "weight";
/**
+ * The name of the attribute which controls whether the connection should
+ * be used as a spare only (all other non-spare connections within the same
+ * balancing group should be preferred).
+ */
+ public static final String FAILOVER_ONLY_NAME = "failover-only";
+
+ /**
* All attributes related to restricting user accounts, within a logical
* form.
*/
@@ -134,7 +142,8 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
* All attributes related to load balancing in a logical form.
*/
public static final Form LOAD_BALANCING = new Form("load-balancing", Arrays.<Field>asList(
- new NumericField(CONNECTION_WEIGHT)
+ new NumericField(CONNECTION_WEIGHT),
+ new BooleanField(FAILOVER_ONLY_NAME, "true")
));
/**
@@ -281,6 +290,9 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
// Set connection weight
attributes.put(CONNECTION_WEIGHT, NumericField.format(getModel().getConnectionWeight()));
+ // Set whether connection is failover-only
+ attributes.put(FAILOVER_ONLY_NAME, getModel().isFailoverOnly() ? "true" : null);
+
return attributes;
}
@@ -333,6 +345,9 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
logger.debug("Unable to parse numeric attribute.", e);
}
+ // Translate failover-only attribute
+ getModel().setFailoverOnly("true".equals(attributes.get(FAILOVER_ONLY_NAME)));
+
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/31519061/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
index 0bc2db3..c781c15 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
@@ -20,6 +20,7 @@
"FIELD_HEADER_MAX_CONNECTIONS" : "Maximum number of connections:",
"FIELD_HEADER_MAX_CONNECTIONS_PER_USER" : "Maximum number of connections per user:",
+ "FIELD_HEADER_FAILOVER_ONLY" : "Use for failover only:",
"FIELD_HEADER_WEIGHT" : "Connection weight:",
"FIELD_HEADER_GUACD_HOSTNAME" : "Hostname:",
[7/7] incubator-guacamole-client git commit: GUACAMOLE-317: Merge Add
support for failover-only connections.
Posted by vn...@apache.org.
GUACAMOLE-317: Merge Add support for failover-only connections.
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/18effb24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/18effb24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/18effb24
Branch: refs/heads/master
Commit: 18effb247cec992709dd0760c7b0ad9d3a2bf07e
Parents: 728d9b9 06a090d
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Jun 15 21:05:36 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Jun 15 21:05:36 2017 -0400
----------------------------------------------------------------------
.../auth/jdbc/connection/ConnectionModel.java | 33 ++++++++++++++++++++
.../auth/jdbc/connection/ModeledConnection.java | 30 +++++++++++++++++-
.../tunnel/AbstractGuacamoleTunnelService.java | 29 +++++++++++++----
.../RestrictedGuacamoleTunnelService.java | 8 ++++-
.../src/main/resources/translations/en.json | 1 +
.../schema/001-create-schema.sql | 4 +--
.../schema/upgrade/upgrade-pre-0.9.14.sql | 7 +++++
.../auth/jdbc/connection/ConnectionMapper.xml | 19 +++++++----
.../schema/001-create-schema.sql | 1 +
.../schema/upgrade/upgrade-pre-0.9.14.sql | 7 +++++
.../auth/jdbc/connection/ConnectionMapper.xml | 19 +++++++----
11 files changed, 136 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[6/7] incubator-guacamole-client git commit: GUACAMOLE-317: Add
missing comma to MySQL ConnectionMapper.xml.
Posted by vn...@apache.org.
GUACAMOLE-317: Add missing comma to MySQL ConnectionMapper.xml.
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/06a090d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/06a090d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/06a090d7
Branch: refs/heads/master
Commit: 06a090d7d6d7fcf5a6143cf863db5c3053854fd2
Parents: 1b35d43
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jun 13 22:39:50 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jun 13 22:39:50 2017 -0700
----------------------------------------------------------------------
.../org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/06a090d7/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
index 03ffa43..97c2e54 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/connection/ConnectionMapper.xml
@@ -227,7 +227,7 @@
proxy_hostname = #{object.proxyHostname,jdbcType=VARCHAR},
proxy_port = #{object.proxyPort,jdbcType=INTEGER},
proxy_encryption_method = #{object.proxyEncryptionMethod,jdbcType=VARCHAR},
- connection_weight = #{object.connectionWeight,jdbcType=INTEGER}
+ connection_weight = #{object.connectionWeight,jdbcType=INTEGER},
failover_only = #{object.failoverOnly,jdbcType=BOOLEAN}
WHERE connection_id = #{object.objectID,jdbcType=INTEGER}
</update>
[5/7] incubator-guacamole-client git commit: GUACAMOLE-317: Add
convenience getter for failover-only attribute at Connection level.
Posted by vn...@apache.org.
GUACAMOLE-317: Add convenience getter for failover-only attribute at Connection level.
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/cdf823cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/cdf823cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/cdf823cc
Branch: refs/heads/master
Commit: cdf823cc9f52900bde3aecc6f9d844247840d9c1
Parents: 3151906
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jun 6 13:36:56 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jun 6 17:32:38 2017 -0700
----------------------------------------------------------------------
.../auth/jdbc/connection/ModeledConnection.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/cdf823cc/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
index e2cafe1..7f93de0 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
@@ -451,4 +451,17 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
}
+ /**
+ * Returns whether this connection should be reserved for failover.
+ * Failover-only connections within a balancing group are only used when
+ * all non-failover connections are unavailable.
+ *
+ * @return
+ * true if this connection should be reserved for failover, false
+ * otherwise.
+ */
+ public boolean isFailoverOnly() {
+ return getModel().isFailoverOnly();
+ }
+
}