Merge pull request #5223 from mvdbeek/fix_second_submit_host

Allow shell plugins with different parameters to co-exist

lib/galaxy/jobs/runners/util/cli/__init__.py

@@ -1,5 +1,6 @@
 """
 """
+import json
 from glob import glob
 from os import getcwd
 from os.path import (
@@ -56,9 +57,10 @@ def get_plugins(self, shell_params, job_params):
 
     def get_shell_plugin(self, shell_params):
         shell_plugin = shell_params.get('plugin', DEFAULT_SHELL_PLUGIN)
-        if shell_plugin not in self.active_cli_shells:
-            self.active_cli_shells[shell_plugin] = self.cli_shells[shell_plugin](**shell_params)
-        return self.active_cli_shells[shell_plugin]
+        requested_shell_settings = json.dumps(shell_params, sort_keys=True)
+        if requested_shell_settings not in self.active_cli_shells:
+            self.active_cli_shells[requested_shell_settings] = self.cli_shells[shell_plugin](**shell_params)
+        return self.active_cli_shells[requested_shell_settings]
 
     def get_job_interface(self, job_params):
         job_plugin = job_params.get('plugin', None)

lib/galaxy/jobs/runners/util/cli/shell/rsh.py

@@ -3,8 +3,8 @@
 
 import paramiko
 
+from galaxy.util.bunch import Bunch
 from .local import LocalShell
-from ....util import Bunch
 
 log = logging.getLogger(__name__)
 logging.getLogger("paramiko").setLevel(logging.WARNING)  # paramiko logging is very verbose