x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - master (branch) updated: 0.0.0.6-15-g9ffb741
by git-admin＠x2go.org 07 Mar '13

07 Mar '13

The branch, master has been updated via 9ffb7417721a1ca2ab19e48cca2a545c92a56e0e (commit) from 02b425048b6beca03c0ae202d54005157dc71d5f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9ffb7417721a1ca2ab19e48cca2a545c92a56e0e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 7 05:54:20 2013 +0100 fix for load balancing of agent query mode is LOCAL ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index f9fd037..333368e 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -789,6 +789,13 @@ class X2GoBroker(object): def random_remote_agent(self, profile_id, exclude_agents=[]): """\ + Randomly choose a remote agent for agent query. + + @param profile_id: choose remote agent for this profile ID + @type profile_id: C{unicode} + @param exclude_agents: a list of remote agent dict objects to be exclude from the random choice + @type exclude_agents: C{list} + """ profile = self.get_profile(profile_id) server_list = profile[u'host'] @@ -822,6 +829,7 @@ class X2GoBroker(object): # if we have more than one server, pick one server randomly for X2Go Broker Agent queries server_list = profile[u'host'] + random.shuffle(server_list) agent_query_mode = self.get_agent_query_mode() remote_agent = None @@ -831,7 +839,6 @@ class X2GoBroker(object): # detect best X2Go server for this user if load balancing is configured if len(server_list) >= 2 and username: - # query remote agent for session info, if one of the server's is down, we will try the next one... busy_servers = None exclude_agents = [] @@ -842,12 +849,15 @@ class X2GoBroker(object): except x2gobroker.X2GoBrokerAgentException: logger_broker.warning('base_broker.X2GoBroker.select_session(): failed to query broker agent (quey-mode: {query_mode}, remote_agent: {remote_agent})'.format(query_mode=agent_query_mode, remote_agent=remote_agent)) - # mark this agent as bad - exclude_agents.append(remote_agent) - # also remove this agent from the list of available servers as the machine is probably down - server_list.remove(remote_agent['hostname']) + if agent_query_mode.upper() == u'SSH': + # mark this agent as bad + exclude_agents.append(remote_agent) + # also remove this agent from the list of available servers as the machine is probably down + server_list.remove(remote_agent['hostname']) - remote_agent = self.random_remote_agent(profile_id, exclude_agents=exclude_agents) + remote_agent = self.random_remote_agent(profile_id, exclude_agents=exclude_agents) + else: + remote_agent = None if busy_servers is not None: hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.6-14-g02b4250
by git-admin＠x2go.org 07 Mar '13

07 Mar '13

The branch, master has been updated via 02b425048b6beca03c0ae202d54005157dc71d5f (commit) from 38e1f3976082c99519843ab8f4cfa0730bdd818c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 02b425048b6beca03c0ae202d54005157dc71d5f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 7 05:46:52 2013 +0100 fix call of self.random_remote_agent() ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index d5e775e..f9fd037 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -826,7 +826,7 @@ class X2GoBroker(object): remote_agent = None if agent_query_mode.upper() == u'SSH': - remote_agent = self.random_remote_agent(server_list) + remote_agent = self.random_remote_agent(profile_id) # detect best X2Go server for this user if load balancing is configured if len(server_list) >= 2 and username: hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.6-13-g38e1f39
by git-admin＠x2go.org 07 Mar '13

07 Mar '13

The branch, master has been updated via 38e1f3976082c99519843ab8f4cfa0730bdd818c (commit) from 64282631fe19aa8bea452a059edbff1d36b8d425 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 38e1f3976082c99519843ab8f4cfa0730bdd818c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 7 05:43:06 2013 +0100 syntax fix ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 60e52c3..d5e775e 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -840,7 +840,7 @@ class X2GoBroker(object): try: busy_servers = x2gobroker.agent.find_busy_servers(username=username, query_mode=agent_query_mode, remote_agent=remote_agent) except x2gobroker.X2GoBrokerAgentException: - logger_broker.warning('base_broker.X2GoBroker.select_session(): failed to query broker agent (quey-mode: {query_mode}, remote_agent: {remote_agent})'.format(query_mode=agent_query_mode, remote_agent=remote_agent))) + logger_broker.warning('base_broker.X2GoBroker.select_session(): failed to query broker agent (quey-mode: {query_mode}, remote_agent: {remote_agent})'.format(query_mode=agent_query_mode, remote_agent=remote_agent)) # mark this agent as bad exclude_agents.append(remote_agent) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.6-12-g6428263
by git-admin＠x2go.org 07 Mar '13

07 Mar '13

The branch, master has been updated via 64282631fe19aa8bea452a059edbff1d36b8d425 (commit) from 7f25682383416a9b0487d5cc0268dae9a8bdd0b4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 64282631fe19aa8bea452a059edbff1d36b8d425 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 7 05:39:36 2013 +0100 update changelog about downtime machines ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ 1 file changed, 2 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 00b4ee1..a640f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ x2gobroker (0.0.0.7-0~x2go1) UNRELEASED; urgency=low vs. those returned by the broker agent. (Fixes: #133). - Ignore off-line X2Go servers in multi-node load-balanced setups. (Fixes: #132). + - Return some sane output to x2goclient if the / all configured X2Go + server(s) is/are down. * /debian/control: + Build-Depend on python-paste, python-nose (testsuite needs them). hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.6-11-g7f25682
by git-admin＠x2go.org 07 Mar '13

07 Mar '13

The branch, master has been updated via 7f25682383416a9b0487d5cc0268dae9a8bdd0b4 (commit) from 8e73d26ce1bc5b1f8f1ce314877f90b37e6e8898 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7f25682383416a9b0487d5cc0268dae9a8bdd0b4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 7 05:37:37 2013 +0100 handle cases where the provided server is not available ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 54de6ab..60e52c3 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -892,10 +892,12 @@ class X2GoBroker(object): else: logger_broker.warning('base_broker.X2GoBroker.select_session(): all expected broker agents failed to respond, this does not look good. We tried these agent hosts: {agent_hosts}'.format(agent_hosts=unicode(server_list))) - best_server = server_list[0] + if server_list: best_server = server_list[0] + else: return { 'server': 'no-server-available', 'port': profile[u'sshport'], } else: - best_server = server_list[0] + if server_list: best_server = server_list[0] + else: return { 'server': 'no-server-available', 'port': profile[u'sshport'], } selected_session = { 'server': best_server, hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.6-10-g8e73d26
by git-admin＠x2go.org 07 Mar '13

07 Mar '13

The branch, master has been updated via 8e73d26ce1bc5b1f8f1ce314877f90b37e6e8898 (commit) from fe61669b7ab11de66223f62c52f380fc2b1e43bf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8e73d26ce1bc5b1f8f1ce314877f90b37e6e8898 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 7 05:27:03 2013 +0100 interpret a failing agent as a machine downtime ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 5 +++++ 1 file changed, 5 insertions(+) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 15b79ac..54de6ab 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -841,7 +841,12 @@ class X2GoBroker(object): busy_servers = x2gobroker.agent.find_busy_servers(username=username, query_mode=agent_query_mode, remote_agent=remote_agent) except x2gobroker.X2GoBrokerAgentException: logger_broker.warning('base_broker.X2GoBroker.select_session(): failed to query broker agent (quey-mode: {query_mode}, remote_agent: {remote_agent})'.format(query_mode=agent_query_mode, remote_agent=remote_agent))) + + # mark this agent as bad exclude_agents.append(remote_agent) + # also remove this agent from the list of available servers as the machine is probably down + server_list.remove(remote_agent['hostname']) + remote_agent = self.random_remote_agent(profile_id, exclude_agents=exclude_agents) if busy_servers is not None: hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.6-9-gfe61669
by git-admin＠x2go.org 07 Mar '13

07 Mar '13

The branch, master has been updated via fe61669b7ab11de66223f62c52f380fc2b1e43bf (commit) from e48dab769735322633d28a54c19f25bdeed27aa3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fe61669b7ab11de66223f62c52f380fc2b1e43bf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 7 05:23:25 2013 +0100 fix agent fallback code ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 3 ++- x2gobroker/brokers/base_broker.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 3782bb5..001a800 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -24,6 +24,7 @@ import paramiko import cStringIO import time import threading +import socket import x2gobroker._paramiko x2gobroker._paramiko.monkey_patch_paramiko() @@ -133,7 +134,7 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None) client.close() if result and result[0].startswith('OK'): return [ r for r in result[1:] if r ] - except paramiko.SSHException: + except (paramiko.SSHException, paramiko.AuthenticationException, paramiko.BadHostKeyException, socket.error): raise x2gobroker.X2GoBrokerAgentException('Query to remote X2Go Broker Agent (user: {user}, hostname: {hostname}, port: {port}) failed'.format(user=remote_username, hostname=remote_hostname, port=remote_port)) diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 273e605..15b79ac 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -795,7 +795,7 @@ class X2GoBroker(object): for agent in exclude_agents: if agent['hostname'] in server_list: - server_list.remove(server) + server_list.remove(agent['hostname']) remote_agent = None if server_list: @@ -840,6 +840,7 @@ class X2GoBroker(object): try: busy_servers = x2gobroker.agent.find_busy_servers(username=username, query_mode=agent_query_mode, remote_agent=remote_agent) except x2gobroker.X2GoBrokerAgentException: + logger_broker.warning('base_broker.X2GoBroker.select_session(): failed to query broker agent (quey-mode: {query_mode}, remote_agent: {remote_agent})'.format(query_mode=agent_query_mode, remote_agent=remote_agent))) exclude_agents.append(remote_agent) remote_agent = self.random_remote_agent(profile_id, exclude_agents=exclude_agents) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

python-x2go.git - master (branch) updated: 0.4.0.2-2-g9ac619d
by git-admin＠x2go.org 07 Mar '13

07 Mar '13

The branch, master has been updated via 9ac619d8b2968ccfcd7a3e151e62fc50bc875fbb (commit) from ec2880a3c14c5b8c475b2c76109a7be61412085d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9ac619d8b2968ccfcd7a3e151e62fc50bc875fbb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 7 05:07:39 2013 +0100 Fix inheritance of Paramiko/SSH exception. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2go/x2go_exceptions.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cff8154..94bba01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-x2go (0.4.0.3-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.2): + - Fix inheritance of Paramiko/SSH exception. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 03 Mar 2013 15:57:44 +0100 diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py index be69208..688a8ba 100644 --- a/x2go/x2go_exceptions.py +++ b/x2go/x2go_exceptions.py @@ -32,9 +32,9 @@ from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS # Python X2Go Exceptions AuthenticationException = paramiko.AuthenticationException """inherited from Python Paramiko library""" -PasswordRequiredException = paramiko.AuthenticationException +PasswordRequiredException = paramiko.PasswordRequiredException """inherited from Python Paramiko library""" -BadHostKeyException = paramiko.AuthenticationException +BadHostKeyException = paramiko.BadHostKeyException """inherited from Python Paramiko library""" SSHException = paramiko.SSHException """inherited from Python Paramiko library""" hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.6-8-ge48dab7
by git-admin＠x2go.org 06 Mar '13

06 Mar '13

The branch, master has been updated via e48dab769735322633d28a54c19f25bdeed27aa3 (commit) from 09dff9341cb3dc697bce90864fe3e9c76f059269 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e48dab769735322633d28a54c19f25bdeed27aa3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 6 19:23:46 2013 +0100 Ignore off-line X2Go servers in multi-node load-balanced setups. (Fixes: #132). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + x2gobroker/__init__.py | 9 ++++ x2gobroker/agent.py | 3 +- x2gobroker/brokers/base_broker.py | 97 +++++++++++++++++++++++++------------ 4 files changed, 78 insertions(+), 33 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d8c0c3c..00b4ee1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ x2gobroker (0.0.0.7-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.0.7): - Add algorithm to ,,normalize'' hostnames used in session profiles vs. those returned by the broker agent. (Fixes: #133). + - Ignore off-line X2Go servers in multi-node load-balanced setups. + (Fixes: #132). * /debian/control: + Build-Depend on python-paste, python-nose (testsuite needs them). diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index 6d877ca..f63bf9c 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -20,3 +20,12 @@ __VERSION__ = '0.0.0.7' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' + +from loggers import logger_error + +class X2GoBrokerBaseException(BaseException): + def __init__(self, *args, **kwargs): + BaseException.__init__(self, *args, **kwargs) + logger_error.error('An exceptional problem occurred: {exception}("{msg}")'.format(exception=type(self).__name__, msg=str(self))) + +class X2GoBrokerAgentException(X2GoBrokerBaseException): pass diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 9b63f00..3782bb5 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -82,6 +82,7 @@ def call_local_broker_agent(username, mode, cmdline_args=[]): if result[0].startswith('OK'): return [ r for r in result[1:] if r ] + raise x2gobroker.X2GoBrokerAgentException('Query to local X2Go Broker Agent failed with no response') def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None): """\ @@ -133,7 +134,7 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None) if result and result[0].startswith('OK'): return [ r for r in result[1:] if r ] except paramiko.SSHException: - logger_error.error('could not connect to remote X2Go Broker Agent (user: {user}, hostname: {hostname}, port: {port}'.format(user=remote_username, hostname=remote_hostname, port=remote_port)) + raise x2gobroker.X2GoBrokerAgentException('Query to remote X2Go Broker Agent (user: {user}, hostname: {hostname}, port: {port}) failed'.format(user=remote_username, hostname=remote_hostname, port=remote_port)) def list_sessions(username, query_mode='LOCAL', remote_agent=None): diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 04dd86b..273e605 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -787,6 +787,24 @@ class X2GoBroker(object): return list_of_profiles + def random_remote_agent(self, profile_id, exclude_agents=[]): + """\ + """ + profile = self.get_profile(profile_id) + server_list = profile[u'host'] + + for agent in exclude_agents: + if agent['hostname'] in server_list: + server_list.remove(server) + + remote_agent = None + if server_list: + random.shuffle(server_list) + remote_agent_server = server_list[0] + remote_agent_port = profile[u'sshport'] + remote_agent = {u'hostname': remote_agent_server, u'port': remote_agent_port, } + return remote_agent + def select_session(self, profile_id, username=None): """\ Start/resume a session by selecting a profile name offered by the X2Go client. @@ -808,52 +826,67 @@ class X2GoBroker(object): remote_agent = None if agent_query_mode.upper() == u'SSH': - random.shuffle(server_list) - remote_agent_server = server_list[0] - remote_agent_port = profile[u'sshport'] - remote_agent = {u'hostname': remote_agent_server, u'port': remote_agent_port, } + remote_agent = self.random_remote_agent(server_list) # detect best X2Go server for this user if load balancing is configured if len(server_list) >= 2 and username: - busy_servers = x2gobroker.agent.find_busy_servers(username=username, query_mode=agent_query_mode, remote_agent = remote_agent) - # when detecting the server load we have to support handling of differing subdomains (config - # file vs. server load returned by x2gobroker agent). Best approach: all members of a multi-node - # server farm either (a) do not have a subdomain in their hostname or (b) the subdomain is - # is identical. + # query remote agent for session info, if one of the server's is down, we will try the next one... + busy_servers = None + exclude_agents = [] + while not busy_servers and remote_agent: + + try: + busy_servers = x2gobroker.agent.find_busy_servers(username=username, query_mode=agent_query_mode, remote_agent=remote_agent) + except x2gobroker.X2GoBrokerAgentException: + exclude_agents.append(remote_agent) + remote_agent = self.random_remote_agent(profile_id, exclude_agents=exclude_agents) - # Example: - # - # ts01, ts02 - hostnames as returned by agent - # ts01.intern, ts02.intern - hostnames configured in session profile option ,,host'' - # -> this will result in the subdomain .intern being stripped off from the hostnames before detecting - # the best server for this user + if busy_servers is not None: - ### NORMALIZE (=reduce to hostname only) X2Go server names (as found in config) if possible - server_list_normalized, subdomains_config = x2gobroker.utils.normalize_hostnames(server_list) + # if we do not get until here, then all broker agent calls have failed!!!! - ### NORMALIZE X2Go server names (as returned by x2gobroker agent)--only if the hostnames in the config share the same subdomain - if len(subdomains_config) == 1: + # when detecting the server load we have to support handling of differing subdomains (config + # file vs. server load returned by x2gobroker agent). Best approach: all members of a multi-node + # server farm either (a) do not have a subdomain in their hostname or (b) the subdomain is + # is identical. - busy_servers_normalized, subdomains_agent = x2gobroker.utils.normalize_hostnames(busy_servers) - if len(subdomains_agent) <= 1: + # Example: + # + # ts01, ts02 - hostnames as returned by agent + # ts01.intern, ts02.intern - hostnames configured in session profile option ,,host'' + # -> this will result in the subdomain .intern being stripped off from the hostnames before detecting + # the best server for this user - # all X2Go servers in the multi-node server farm are in the same DNS subdomain - # we can operate on hostname-only hostnames - server_list = server_list_normalized - busy_servers = busy_servers_normalized + ### NORMALIZE (=reduce to hostname only) X2Go server names (as found in config) if possible + server_list_normalized, subdomains_config = x2gobroker.utils.normalize_hostnames(server_list) - for server in server_list: - if server not in busy_servers.keys(): - busy_servers[server] = 0 + ### NORMALIZE X2Go server names (as returned by x2gobroker agent)--only if the hostnames in the config share the same subdomain + if len(subdomains_config) == 1: - busy_server_list = [ (load, server) for server, load in busy_servers.items() ] - busy_server_list.sort() + busy_servers_normalized, subdomains_agent = x2gobroker.utils.normalize_hostnames(busy_servers) + if len(subdomains_agent) <= 1: - logger_broker.debug('base_broker.X2GoBroker.select_session(): load balancer analysis: {server_load}'.format(server_load=unicode(busy_server_list))) + # all X2Go servers in the multi-node server farm are in the same DNS subdomain + # we can operate on hostname-only hostnames + server_list = server_list_normalized + busy_servers = busy_servers_normalized - best_server = busy_server_list[0][1] + for server in server_list: + if server not in busy_servers.keys(): + busy_servers[server] = 0 + + busy_server_list = [ (load, server) for server, load in busy_servers.items() ] + busy_server_list.sort() + + logger_broker.debug('base_broker.X2GoBroker.select_session(): load balancer analysis: {server_load}'.format(server_load=unicode(busy_server_list))) + + best_server = busy_server_list[0][1] + + else: + logger_broker.warning('base_broker.X2GoBroker.select_session(): all expected broker agents failed to respond, this does not look good. We tried these agent hosts: {agent_hosts}'.format(agent_hosts=unicode(server_list))) + best_server = server_list[0] else: best_server = server_list[0] hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.6-7-g09dff93
by git-admin＠x2go.org 06 Mar '13

06 Mar '13

The branch, master has been updated via 09dff9341cb3dc697bce90864fe3e9c76f059269 (commit) from 2573ffdec27908663f7ae786e6e9af4230dc69a8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 09dff9341cb3dc697bce90864fe3e9c76f059269 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 6 18:33:24 2013 +0100 fix hostname normalization, works now... ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 2d9d1ec..04dd86b 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -837,7 +837,7 @@ class X2GoBroker(object): if len(subdomains_config) == 1: busy_servers_normalized, subdomains_agent = x2gobroker.utils.normalize_hostnames(busy_servers) - if len(subdomains_agent) == 1: + if len(subdomains_agent) <= 1: # all X2Go servers in the multi-node server farm are in the same DNS subdomain # we can operate on hostname-only hostnames hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits