hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1077591 - in /hadoop/common/branches/branch-0.20-security-patches/src: mapred/org/apache/hadoop/mapred/ test/org/apache/hadoop/mapred/ webapps/job/
Date Fri, 04 Mar 2011 04:32:51 GMT
Author: omalley
Date: Fri Mar  4 04:32:51 2011
New Revision: 1077591

URL: http://svn.apache.org/viewvc?rev=1077591&view=rev
Log:
commit ec0306d83fbb0cfd33bf928a6a4673e677c8f151
Author: Devaraj Das <ddas@yahoo-inc.com>
Date:   Fri Jul 23 11:12:00 2010 -0700

     from
    
    +++ b/YAHOO-CHANGES.txt
    +     - Provides access to JobHistory file (raw) with job user/acl
    +    permission. (Srikanth Sundarrajan via ddas)
    +

Added:
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/RawHistoryFileServlet.java
    hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestRawHistoryFile.java
    hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/gethistory.jsp
Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistoryServer.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistoryServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistoryServer.java?rev=1077591&r1=1077590&r2=1077591&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistoryServer.java
(original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistoryServer.java
Fri Mar  4 04:32:51 2011
@@ -178,6 +178,8 @@ public class JobHistoryServer {
       historyServer.setAttribute("jobConf", conf);
       historyServer.setAttribute("aclManager", aclsManager);
     }
+    historyServer.addServlet("historyfile", "/historyfile",
+        RawHistoryFileServlet.class);
   }
 
   private HttpServer initializeWebContainer(JobConf conf,

Added: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/RawHistoryFileServlet.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/RawHistoryFileServlet.java?rev=1077591&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/RawHistoryFileServlet.java
(added)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/RawHistoryFileServlet.java
Fri Mar  4 04:32:51 2011
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.mapred;
+
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.IOUtils;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class RawHistoryFileServlet extends HttpServlet {
+
+  private ServletContext servletContext;
+
+  @Override
+  public void init(ServletConfig servletConfig) throws ServletException {
+    super.init(servletConfig);
+    servletContext = servletConfig.getServletContext();
+  }
+
+  @Override
+  protected void doGet(HttpServletRequest request,
+                       HttpServletResponse response)
+      throws ServletException, IOException {
+
+    String logFile = request.getParameter("logFile");
+
+    if (logFile == null) {
+      response.sendError(HttpServletResponse.SC_BAD_REQUEST,
+              "Invalid log file name");
+      return;
+    }
+
+    FileSystem fs = (FileSystem) servletContext.getAttribute("fileSys");
+    JobConf jobConf = (JobConf) servletContext.getAttribute("jobConf");
+    ACLsManager aclsManager = (ACLsManager) servletContext.getAttribute("aclManager");
+    Path logFilePath = new Path(logFile);
+    JobHistory.JobInfo job = null;
+    try {
+      job = JSPUtil.checkAccessAndGetJobInfo(request,
+        response, jobConf, aclsManager, fs, logFilePath);
+    } catch (InterruptedException e) {
+      response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+          "Request interrupted");
+    }
+
+    if (job == null) {
+      response.sendError(HttpServletResponse.SC_MOVED_PERMANENTLY,
+                "Job details doesn't exist");
+      return;
+    }
+
+    InputStream in = fs.open(logFilePath);
+    try {
+      IOUtils.copyBytes(in, response.getOutputStream(), 8192, false);
+    } finally {
+      in.close();
+    }
+  }
+}

Added: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestRawHistoryFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestRawHistoryFile.java?rev=1077591&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestRawHistoryFile.java
(added)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestRawHistoryFile.java
Fri Mar  4 04:32:51 2011
@@ -0,0 +1,212 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.mapred;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.LongWritable;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.mapred.lib.NullOutputFormat;
+import org.junit.Assert;
+
+import java.io.IOException;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+
+import junit.framework.TestCase;
+
+public class TestRawHistoryFile extends TestCase {
+  private static final Log LOG = LogFactory.getLog(TestRawHistoryFile.class);
+
+  public void testRetrieveHistoryFile() {
+
+    MiniMRCluster mrCluster = null;
+    JobConf conf = new JobConf();
+    try {
+      conf.setLong("mapred.job.tracker.retiredjobs.cache.size", 1);
+      conf.setLong("mapred.jobtracker.retirejob.interval", 0);
+      conf.setLong("mapred.jobtracker.retirejob.check", 0);
+      conf.setLong("mapred.jobtracker.completeuserjobs.maximum", 0);
+      conf.set("mapreduce.history.server.http.address", "localhost:0");
+
+      mrCluster = new MiniMRCluster(1, conf.get("fs.default.name"), 1,
+          null, null, conf);
+
+      conf = mrCluster.createJobConf();
+      createInputFile(conf, "/tmp/input");
+
+      RunningJob job = runJob(conf);
+      LOG.info("Job details: " + job);
+
+      String historyFile = saveHistoryFile(job.getTrackingURL().
+          replaceAll("jobdetails.jsp", "gethistory.jsp"));
+      JobHistory.JobInfo jobInfo = new JobHistory.JobInfo(job.getJobID());
+      DefaultJobHistoryParser.parseJobTasks(historyFile, jobInfo,
+          FileSystem.getLocal(conf));
+      LOG.info("STATUS: " + jobInfo.getValues().get(JobHistory.Keys.JOB_STATUS));
+      LOG.info("JOBID: " + jobInfo.getValues().get(JobHistory.Keys.JOBID));
+      Assert.assertEquals(jobInfo.getValues().get(JobHistory.Keys.JOB_STATUS),
+          "SUCCESS");
+      Assert.assertEquals(jobInfo.getValues().get(JobHistory.Keys.JOBID),
+          job.getJobID());
+
+    } catch (IOException e) {
+      LOG.error("Failure running test", e);
+      Assert.fail(e.getMessage());
+    } finally {
+      if (mrCluster != null) mrCluster.shutdown();
+    }
+  }
+
+  public void testRunningJob() {
+
+    MiniMRCluster mrCluster = null;
+    JobConf conf = new JobConf();
+    try {
+      conf.setLong("mapred.job.tracker.retiredjobs.cache.size", 1);
+      conf.setLong("mapred.jobtracker.retirejob.interval", 0);
+      conf.setLong("mapred.jobtracker.retirejob.check", 0);
+      conf.setLong("mapred.jobtracker.completeuserjobs.maximum", 0);
+      conf.set("mapreduce.history.server.http.address", "localhost:0");
+
+      mrCluster = new MiniMRCluster(1, conf.get("fs.default.name"), 1,
+          null, null, conf);
+
+      conf = mrCluster.createJobConf();
+      createInputFile(conf, "/tmp/input");
+
+      RunningJob job = submitJob(conf);
+      LOG.info("Job details: " + job);
+
+      String url = job.getTrackingURL().
+          replaceAll("jobdetails.jsp", "gethistory.jsp");
+      HttpClient client = new HttpClient();
+      GetMethod method = new GetMethod(url);
+      try {
+        int status = client.executeMethod(method);
+        Assert.assertEquals(status, HttpURLConnection.HTTP_BAD_REQUEST);
+      } finally {
+        method.releaseConnection();
+        job.killJob();
+      }
+
+    } catch (IOException e) {
+      LOG.error("Failure running test", e);
+      Assert.fail(e.getMessage());
+    } finally {
+      if (mrCluster != null) mrCluster.shutdown();
+    }
+  }
+
+  public void testRetrieveInvalidJob() {
+
+    MiniMRCluster mrCluster = null;
+    JobConf conf = new JobConf();
+    try {
+      conf.set("mapreduce.history.server.http.address", "localhost:0");
+      mrCluster = new MiniMRCluster(1, conf.get("fs.default.name"), 1,
+          null, null, conf);
+      JobConf jobConf = mrCluster.createJobConf();
+
+      String url = "http://" + jobConf.get("mapred.job.tracker.http.address") +
+          "/gethistory.jsp?jobid=job_20100714163314505_9991";
+      HttpClient client = new HttpClient();
+      GetMethod method = new GetMethod(url);
+      try {
+        int status = client.executeMethod(method);
+        Assert.assertEquals(status, HttpURLConnection.HTTP_BAD_REQUEST);
+      } finally {
+        method.releaseConnection();
+      }
+
+    } catch (IOException e) {
+      LOG.error("Failure running test", e);
+      Assert.fail(e.getMessage());
+    } finally {
+      if (mrCluster != null) mrCluster.shutdown();
+    }
+  }
+
+  private void createInputFile(Configuration conf, String path)
+      throws IOException {
+    FileSystem fs = FileSystem.get(conf);
+    FSDataOutputStream out = fs.create(new Path(path));
+    try {
+      out.write("hello world".getBytes());
+    } finally {
+      out.close();
+    }
+  }
+
+  private synchronized RunningJob runJob(JobConf conf) throws IOException {
+    configureJob(conf);
+    return JobClient.runJob(conf);
+  }
+
+  private synchronized RunningJob submitJob(JobConf conf) throws IOException {
+    configureJob(conf);
+
+    JobClient client = new JobClient(conf);
+    return client.submitJob(conf);
+  }
+
+  private void configureJob(JobConf conf) {
+    conf.setJobName("History");
+
+    conf.setInputFormat(TextInputFormat.class);
+
+    conf.setMapOutputKeyClass(LongWritable.class);
+    conf.setMapOutputValueClass(Text.class);
+
+    conf.setOutputFormat(NullOutputFormat.class);
+    conf.setOutputKeyClass(LongWritable.class);
+    conf.setOutputValueClass(Text.class);
+
+    conf.setMapperClass(org.apache.hadoop.mapred.lib.IdentityMapper.class);
+    conf.setReducerClass(org.apache.hadoop.mapred.lib.IdentityReducer.class);
+
+    FileInputFormat.setInputPaths(conf, "/tmp/input");
+  }
+
+  private String saveHistoryFile(String url) throws IOException {
+    LOG.info("History url: "  + url);
+    HttpClient client = new HttpClient();
+    GetMethod method = new GetMethod(url);
+    try {
+      int status = client.executeMethod(method);
+      Assert.assertEquals(status, HttpURLConnection.HTTP_OK);
+      
+      File out = File.createTempFile("HIST_", "hist");
+      IOUtils.copyBytes(method.getResponseBodyAsStream(),
+          new FileOutputStream(out), 4096, true);
+      return out.getAbsolutePath();
+    } finally {
+      method.releaseConnection();
+    }
+  }
+}

Added: hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/gethistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/gethistory.jsp?rev=1077591&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/gethistory.jsp (added)
+++ hadoop/common/branches/branch-0.20-security-patches/src/webapps/job/gethistory.jsp Fri
Mar  4 04:32:51 2011
@@ -0,0 +1,62 @@
+<%
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+%>
+<%@ page
+    contentType="application/octet-stream; charset=UTF-8"
+    import="org.apache.hadoop.mapred.*"
+    import="org.apache.hadoop.mapred.JSPUtil.JobWithViewAccessCheck"
+%>
+
+<%
+    String jobId = request.getParameter("jobid");
+    if (jobId == null) {
+      response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Missing 'jobid'!");
+      return;
+    }
+    
+    final JobTracker tracker = (JobTracker) application.getAttribute(
+        "job.tracker");
+
+    final JobID jobIdObj = JobID.forName(jobId);
+    JobWithViewAccessCheck myJob = JSPUtil.checkAccessAndGetJob(tracker, jobIdObj,
+                                                     request, response);
+    if (!myJob.isViewJobAllowed()) {
+      return; // user is not authorized to view this job
+    }
+
+    JobInProgress job = myJob.getJob();
+
+    if (job != null && !job.getStatus().isJobComplete()) {
+      response.getWriter().print("Job " + jobId + " is still in running");
+      response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+      return;
+    }
+
+    String historyFile = JobHistory.getHistoryFilePath(jobIdObj);
+    if (historyFile == null) {
+      response.getWriter().print("Job " + jobId + " not known");
+      response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+      return;
+    }
+
+    String historyUrl = "http://" + JobHistoryServer.getAddress(tracker.conf) +
+      "/historyfile?logFile=" +
+      JobHistory.JobInfo.encodeJobHistoryFilePath(historyFile);
+    response.sendRedirect(response.encodeRedirectURL(historyUrl));
+%>
\ No newline at end of file



Mime
View raw message