Página inicial Explorar Ajuda
Registrar Entrar
apache
/
hadoop
mirror de https://github.com/apache/hadoop.git
2
0
Fork 1
Arquivos Issues 0 Wiki
Ver código fonte

HADOOP-1484. Permit one to kill jobs from the web ui.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@549209 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 anos atrás
pai
981a7c7075
commit
0b3b5c0c8a
5 arquivos alterados com 69 adições e 7 exclusões
Visão unificada Mostrar estatísticas do Diff
  1. 5 0
      CHANGES.txt
  2. 12 0
      conf/hadoop-default.xml
  3. 1 1
      src/java/org/apache/hadoop/dfs/JspHelper.java
  4. 47 4
      src/webapps/job/jobdetails.jsp
  5. 4 2
      src/webapps/job/jobtracker.jsp

+ 5 - 0
CHANGES.txt
Ver arquivo 

@@ -188,6 +188,11 @@ Trunk (unreleased changes)
 
  58. HADOOP-1505.  Remove spurious stacktrace in ZlibFactory
 
  58. HADOOP-1505.  Remove spurious stacktrace in ZlibFactory
 
      introduced in HADOOP-1093.  (Michael Stack via tomwhite)
 
      introduced in HADOOP-1093.  (Michael Stack via tomwhite)
 
 
 
+ 59. HADOOP-1484.  Permit one to kill jobs from the web ui.  Note that
 
+     this is disabled by default.  One must set
 
+     "webinterface.private.actions" to enable this.
 
+     (Enis Soztutar via cutting)
 
+
 
 
 
 Release 0.13.0 - 2007-06-08
 
 Release 0.13.0 - 2007-06-08

+ 12 - 0
conf/hadoop-default.xml
Ver arquivo 

@@ -912,4 +912,16 @@ creations/deletions), or "all".</description>
 
                 calls</description>
 
                 calls</description>
 
 </property>
 
 </property>
 
 
 
+<!-- Web Interface Configuration -->
 
+
 
+<property>
 
+  <name>webinterface.private.actions</name>
 
+  <value>false</value>
 
+  <description> If set to true, the web interfaces of JT and NN may contain 
+                actions, such as kill job, delete file, etc., that should 
+                not be exposed to public. Enable this option if the interfaces 
+                are only reachable by those who have the right authorization.
 
+  </description>
 
+</property>
 
+
 
 </configuration>
 
 </configuration>

+ 1 - 1
src/java/org/apache/hadoop/dfs/JspHelper.java
Ver arquivo 

@@ -32,7 +32,7 @@ import org.apache.hadoop.conf.*;
 
 public class JspHelper {
 
 public class JspHelper {
 
   static FSNamesystem fsn = null;
 
   static FSNamesystem fsn = null;
 
   static InetSocketAddress nameNodeAddr;
 
   static InetSocketAddress nameNodeAddr;
 
-  static Configuration conf = new Configuration();
 
+  public static Configuration conf = new Configuration();
 
 
 
   static int defaultChunkSizeToView = 
   static int defaultChunkSizeToView = 
     conf.getInt("dfs.default.chunk.view.size", 32 * 1024);
 
     conf.getInt("dfs.default.chunk.view.size", 32 * 1024);

+ 47 - 4
src/webapps/job/jobdetails.jsp
Ver arquivo 

@@ -8,10 +8,14 @@
 
   import="java.text.DecimalFormat"
 
   import="java.text.DecimalFormat"
 
   import="org.apache.hadoop.mapred.*"
 
   import="org.apache.hadoop.mapred.*"
 
   import="org.apache.hadoop.util.*"
 
   import="org.apache.hadoop.util.*"
 
+  import="org.apache.hadoop.dfs.JspHelper"
 
 %>
 
 %>
 
 
 
 <%!
 
 <%!
 
   
   
+	private static final String PRIVATE_ACTIONS_KEY 
+		= "webinterface.private.actions";
 
+
 
   JobTracker tracker = JobTracker.getTracker();
 
   JobTracker tracker = JobTracker.getTracker();
 
   String trackerName = 
   String trackerName = 
            StringUtils.simpleHostname(tracker.getJobTrackerMachine());
 
            StringUtils.simpleHostname(tracker.getJobTrackerMachine());
 
@@ -70,6 +74,18 @@
 
                   ) + 
                   ) + 
               "</td></tr>\n");
 
               "</td></tr>\n");
 
   }
 
   }
 
+  
+  private void printConfirm(JspWriter out, String jobId) throws IOException{
 
+    String url = "jobdetails.jsp?jobid=" + jobId;
 
+    out.print("<html><head><META http-equiv=\"refresh\" content=\"15;URL="
 
+        + url+"\"></head>"
 
+        + "<body><h3> Are you sure you want to kill " + jobId
 
+        + " ?<h3><br><table border=\"0\"><tr><td width=\"100\">"
 
+        + "<a href=\"" +  url + "&action=kill"
 
+        + "\">Kill</a></td><td width=\"100\"><a href=\"" + url
 
+        + "\">Don't Kill</a></td></tr></table></body></html>");
 
+  }
 
+  
 %>       
 %>       
 <%   
 <%   
     String jobId = request.getParameter("jobid"); 
     String jobId = request.getParameter("jobid"); 
@@ -83,6 +99,19 @@
 
         catch (NumberFormatException ignored) {
 
         catch (NumberFormatException ignored) {
 
         }
 
         }
 
     }
 
     }
 
+    
+    JobInProgress job = (JobInProgress) tracker.getJob(jobId);
 
+    
+    if(JspHelper.conf.getBoolean(PRIVATE_ACTIONS_KEY, false)) {
 
+    	String action = request.getParameter("action");
 
+	    if(action!=null && action.equalsIgnoreCase("confirm")) {
 
+  	      printConfirm(out, jobId);
 
+    	    return;
 
+	    }
 
+  	  else if(action != null && action.equalsIgnoreCase("kill")) {
 
+				job.kill();
 
+	    }
 
+    }
 
 %>
 
 %>
 
 
 
 <html>
 
 <html>
 
@@ -100,7 +129,6 @@
 
 <h1>Hadoop <%=jobId%> on <a href="/jobtracker.jsp"><%=trackerName%></a></h1>
 
 <h1>Hadoop <%=jobId%> on <a href="/jobtracker.jsp"><%=trackerName%></a></h1>
 
 
 
 <% 
 <% 
-    JobInProgress job = (JobInProgress) tracker.getJob(jobId);
 
     if (job == null) {
 
     if (job == null) {
 
       out.print("<b>Job " + jobId + " not found.</b><br>\n");
 
       out.print("<b>Job " + jobId + " not found.</b><br>\n");
 
       return;
 
       return;
 
@@ -117,17 +145,27 @@
 
     } else {
 
     } else {
 
       out.print("<b>Job File:</b> " + profile.getJobFile() + "<br>\n");
 
       out.print("<b>Job File:</b> " + profile.getJobFile() + "<br>\n");
 
     }
 
     }
 
-    out.print("<b>Started at:</b> " + new Date(job.getStartTime()) + "<br>\n");
 
     if (runState == JobStatus.RUNNING) {
 
     if (runState == JobStatus.RUNNING) {
 
       out.print("<b>Status:</b> Running<br>\n");
 
       out.print("<b>Status:</b> Running<br>\n");
 
+      out.print("<b>Started at:</b> " + new Date(job.getStartTime()) + "<br>\n");
 
+      out.print("<b>Runnning for:</b> " + StringUtils.formatTimeDiff(
 
+          System.currentTimeMillis(), job.getStartTime()) + "<br>\n");
 
     } else {
 
     } else {
 
       if (runState == JobStatus.SUCCEEDED) {
 
       if (runState == JobStatus.SUCCEEDED) {
 
         out.print("<b>Status:</b> Succeeded<br>\n");
 
         out.print("<b>Status:</b> Succeeded<br>\n");
 
+        out.print("<b>Started at :</b> " + new Date(job.getStartTime()) + "<br>\n");
 
+        out.print("<b>Finished at:</b> " + new Date(job.getFinishTime()) +
 
+                  "<br>\n");
 
+        out.print("<b>Finished in:</b> " + StringUtils.formatTimeDiff(
 
+            job.getFinishTime(), job.getStartTime()) + "<br>\n");
 
       } else if (runState == JobStatus.FAILED) {
 
       } else if (runState == JobStatus.FAILED) {
 
         out.print("<b>Status:</b> Failed<br>\n");
 
         out.print("<b>Status:</b> Failed<br>\n");
 
+        out.print("<b>Started at:</b> " + new Date(job.getStartTime()) + "<br>\n");
 
+        out.print("<b>Failed at :</b> " + new Date(job.getFinishTime()) +
 
+                  "<br>\n");
 
+        out.print("<b>Failed in :</b> " + StringUtils.formatTimeDiff(
 
+            job.getFinishTime(), job.getStartTime()) + "<br>\n");
 
       }
 
       }
 
-      out.print("<b>Finished at:</b> " + new Date(job.getFinishTime()) +
 
-                "<br>\n");
 
     }
 
     }
 
     if (flakyTaskTrackers > 0) {
 
     if (flakyTaskTrackers > 0) {
 
       out.print("<b>Black-listed TaskTrackers:</b> " + 
       out.print("<b>Black-listed TaskTrackers:</b> " + 
@@ -195,6 +233,11 @@
 
     %>
 
     %>
 
     </table>
 
     </table>
 
 
 
+
 
+<% if(JspHelper.conf.getBoolean(PRIVATE_ACTIONS_KEY, false) 
+    	&& runState == JobStatus.RUNNING) { %>
 
+	<hr><a href="jobdetails.jsp?action=confirm&jobid=<%=jobId%>"> Kill this job </a>
 
+<% } %>
 
 <hr>
 
 <hr>
 
 <a href="/jobtracker.jsp">Go back to JobTracker</a><br>
 
 <a href="/jobtracker.jsp">Go back to JobTracker</a><br>
 
 <a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>
 
 <a href="http://lucene.apache.org/hadoop">Hadoop</a>, 2006.<br>

+ 4 - 2
src/webapps/job/jobtracker.jsp
Ver arquivo 

@@ -64,10 +64,12 @@
 
     ClusterStatus status = tracker.getClusterStatus();
 
     ClusterStatus status = tracker.getClusterStatus();
 
     out.print("<table border=\"2\" cellpadding=\"5\" cellspacing=\"2\">\n"+
 
     out.print("<table border=\"2\" cellpadding=\"5\" cellspacing=\"2\">\n"+
 
               "<tr><th>Maps</th><th>Reduces</th>" + 
               "<tr><th>Maps</th><th>Reduces</th>" + 
-              "<th>Tasks/Node</th><th>Nodes</th></tr>\n");
 
+              "<th>Tasks/Node</th><th>Total Submissions</th>" +
 
+              "<th>Nodes</th></tr>\n");
 
     out.print("<tr><td>" + status.getMapTasks() + "</td><td>" +
 
     out.print("<tr><td>" + status.getMapTasks() + "</td><td>" +
 
               status.getReduceTasks() + "</td><td>" + 
               status.getReduceTasks() + "</td><td>" + 
-              status.getMaxTasks() + "</td><td><a href=\"/machines.jsp\">" +
 
+              status.getMaxTasks() + "</td><td>" +
 
+              tracker.getTotalSubmissions() + "</td><td><a href=\"/machines.jsp\">" +
 
               status.getTaskTrackers() + "</a></td></tr></table>\n");
 
               status.getTaskTrackers() + "</a></td></tr></table>\n");
 
   }
 
   }
 
 %>
 
 %>