Changeset 2295

Timestamp:

Mar 17, 2014, 2:09:53 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #533: Add secondary analysis section to Reggie

Added a page listing connected OGS clusters.

Added some more error handling when sending commands to servers via SSH.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• META-INF/servlets.xml (modified) (1 diff)
• resources/admin/ogs-clusters.js (added)
• resources/admin/ogs-clusters.jsp (added)
• resources/images/ogs-cluster.png (added)
• resources/index.jsp (modified) (2 diffs)
• src/net/sf/basedb/reggie/servlet/OgsServlet.java (added)
• src/net/sf/basedb/reggie/ssh/CmdResult.java (added)
• src/net/sf/basedb/reggie/ssh/SshHost.java (modified) (9 diffs)

extensions/net.sf.basedb.reggie/trunk/META-INF/servlets.xml

@@ -101 +101 @@
     <servlet-class>net.sf.basedb.reggie.servlet.SessionServlet</servlet-class>
   </servlet>
+  <servlet>
+    <servlet-name>Ogs</servlet-name>
+    <servlet-class>net.sf.basedb.reggie.servlet.OgsServlet</servlet-class>
+  </servlet>
 </servlets>

extensions/net.sf.basedb.reggie/trunk/resources/index.jsp

@@ -65 +65 @@
   <script language="JavaScript">
   
-  var debug = false;
+  var debug = 1;
   var myPermissions = {};
   
@@ -769 +769 @@
             </ul>
           </dd>
+          <dt>
+            <base:icon image="<%=home + "/images/ogs-cluster.png"%>" />
+            <span class="require-permission" data-role="Administrator" data-link="admin/ogs-clusters.jsp?ID=<%=ID%>">Open Grid Scheduler cluster</span>
           </dl>
           <%

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/ssh/SshHost.java

@@ -1 +1 @@
 package net.sf.basedb.reggie.ssh;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
 import java.security.PublicKey;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import org.json.simple.JSONObject;
@@ -18 +17 @@
 import net.schmizz.sshj.connection.channel.direct.Session.Command;
 import net.schmizz.sshj.transport.verification.PromiscuousVerifier;
-import net.sf.basedb.util.FileUtil;
+import net.sf.basedb.util.FileCopyRunnable;
 
 /**
@@ -43 +42 @@
   
   private String hostInfoCommand = "uname -a";
+//  private String hostInfoCommand = "./demux.sh";
   
   /**
@@ -171 +171 @@
     response is cached.
   */
-  public String getHostInfo()
-  {
-    String systemInfo = (String)infoCache.get("host-info");
+  public CmdResult getHostInfo()
+  {
+    CmdResult systemInfo = (CmdResult)infoCache.get("host-info");
     if (systemInfo == null)
     {
-      try
-      {
-        systemInfo = executeCmd(getHostInfoCommand());
-      }
-      catch (Exception ex)
-      {
-        systemInfo = ex.getMessage();
-      }
+      systemInfo = executeCmd(getHostInfoCommand(), 2);
       infoCache.put("host-info", systemInfo);
     }
@@ -193 +186 @@
     be used to send commands or transfer files to/from
     the host.
-  */
-  public SSHClient connect()
+    @param timeout Timeout in seconds for the connection to be established
+  */
+  public SSHClient connect(int timeout)
   {
     SSHClient ssh = new SSHClient();
@@ -207 +201 @@
     try
     {
+      ssh.setConnectTimeout(timeout * 1000);
       ssh.connect(getAddress(), getPort());
       ssh.authPassword(getUser(), getPassword());
@@ -221 +216 @@
     Execute a single command on the host and return the
     output as a string.
-  */
-  public String executeCmd(String cmd)
-  {
-    
-    SSHClient ssh = connect();
+    @param cmd The command to execute
+    @param timeout Timeout in seconds to wait for the command to
+      finish
+  */
+  public CmdResult executeCmd(String cmd, int timeout)
+  {
+    SSHClient ssh = null;
     Session s = null;
-    StringWriter out = new StringWriter();
+    CmdResult result = new CmdResult();
     try
     {
+      ssh = connect(timeout);
+      ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+      ByteArrayOutputStream stderr = new ByteArrayOutputStream();
+      
       s = ssh.startSession();
       Command c = s.exec(cmd);
-      InputStream result = c.getInputStream();
-      FileUtil.copy(new InputStreamReader(result), out);
+
+      new Thread(new FileCopyRunnable(c.getInputStream(), stdout)).start();
+      new Thread(new FileCopyRunnable(c.getErrorStream(), stderr)).start();
+      s.join(timeout, TimeUnit.SECONDS);
+
+      result.setStdout(stdout.toString("UTF-8"));
+      result.setStderr(stderr.toString("UTF-8"));
+      result.setExitStatus(c.getExitStatus());
     }
     catch (Exception ex)
     {
-      throw new RuntimeException(ex);
+      result.setException(ex);
     }
     finally
@@ -244 +251 @@
       SshUtil.close(ssh);
     }
-    return out.toString();
+    return result;
   }
 
@@ -265 +272 @@
       JSONObject jsonHostInfo = new JSONObject();
       jsonHostInfo.put("cmd", getHostInfoCommand());
-      jsonHostInfo.put("info", getHostInfo());
+      jsonHostInfo.put("info", getHostInfo().asJSONObject());
       json.put("hostInfo", jsonHostInfo);