hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1077669 - in /hadoop/common/branches/branch-0.20-security-patches/src/test/system: aop/org/apache/hadoop/mapred/ java/org/apache/hadoop/mapred/ java/org/apache/hadoop/mapreduce/test/system/
Date Fri, 04 Mar 2011 04:42:19 GMT
Author: omalley
Date: Fri Mar  4 04:42:18 2011
New Revision: 1077669

URL: http://svn.apache.org/viewvc?rev=1077669&view=rev
Log:
commit 6f4e20824bb317e3b5b69e2e73d7bf41654ce116
Author: Konstantin Boudnik <cos@apache.org>
Date:   Thu Sep 9 16:32:54 2010 -0700

    . 0.20.200 build is broken (cos)
    
    +++ b/YAHOO-CHANGES.txt
    +    . 0.20.200 build is broken (cos)
    +

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/mapred/JobInProgressAspect.aj
    hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/JobInfoImpl.java
    hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
    hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JobInfo.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/mapred/JobInProgressAspect.aj
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/mapred/JobInProgressAspect.aj?rev=1077669&r1=1077668&r2=1077669&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/mapred/JobInProgressAspect.aj
(original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/aop/org/apache/hadoop/mapred/JobInProgressAspect.aj
Fri Mar  4 04:42:18 2011
@@ -43,14 +43,13 @@ privileged aspect JobInProgressAspect {
           this.pendingMaps(), this.pendingReduces(), this.finishedMaps(), this
               .finishedReduces(), this.getStatus(), historyLoc, this
               .getBlackListedTrackers(), false, this.numMapTasks,
-          this.numReduceTasks, this.isHistoryFileCopied());
+          this.numReduceTasks);
     } else {
       jobInfoImpl = new JobInfoImpl(
           this.getJobID(), false, false, false, 0, 0, this.pendingMaps(), this
               .pendingReduces(), this.finishedMaps(), this.finishedReduces(),
           this.getStatus(), historyLoc, this.getBlackListedTrackers(), this
-              .isComplete(), this.numMapTasks, this.numReduceTasks, 
-              this.isHistoryFileCopied());
+              .isComplete(), this.numMapTasks, this.numReduceTasks);
     }
     jobInfoImpl.setFinishTime(getJobFinishTime());
     jobInfoImpl.setLaunchTime(getJobLaunchTime());

Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/JobInfoImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/JobInfoImpl.java?rev=1077669&r1=1077668&r2=1077669&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/JobInfoImpl.java
(original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapred/JobInfoImpl.java
Fri Mar  4 04:42:18 2011
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.hadoop.mapred.JobStatus;
 import org.apache.hadoop.mapreduce.JobID;
 import org.apache.hadoop.mapreduce.test.system.JobInfo;
 
@@ -50,7 +49,6 @@ class JobInfoImpl implements JobInfo {
   private int finishedReduces;
   private int numMaps;
   private int numReduces;
-  private boolean historyCopied;
   private long finishTime;
   private long launchTime;
   private int numOfSlotsPerMap;
@@ -69,7 +67,7 @@ class JobInfoImpl implements JobInfo {
       int waitingMaps, int waitingReduces, int finishedMaps,
       int finishedReduces, JobStatus status, String historyUrl,
       List<String> blackListedTracker, boolean isComplete, int numMaps,
-      int numReduces, boolean historyCopied) {
+      int numReduces) {
     super();
     this.blackListedTracker = blackListedTracker;
     this.historyUrl = historyUrl;
@@ -86,7 +84,6 @@ class JobInfoImpl implements JobInfo {
     this.finishedReduces = finishedReduces;
     this.numMaps = numMaps;
     this.numReduces = numReduces;
-    this.historyCopied = historyCopied;
   }
 
   @Override
@@ -163,11 +160,6 @@ class JobInfoImpl implements JobInfo {
   public int numReduces() {
     return numReduces;
   }
-  
-  @Override
-  public boolean isHistoryFileCopied() {
-    return historyCopied;
-  }
 
   public void setFinishTime(long finishTime) {
     this.finishTime = finishTime;
@@ -225,7 +217,6 @@ class JobInfoImpl implements JobInfo {
     finishedReduces = in.readInt();
     numMaps = in.readInt();
     numReduces = in.readInt();
-    historyCopied = in.readBoolean();
     finishTime = in.readLong();
     launchTime = in.readLong();
     numOfSlotsPerMap = in.readInt();
@@ -252,7 +243,6 @@ class JobInfoImpl implements JobInfo {
     out.writeInt(finishedReduces);
     out.writeInt(numMaps);
     out.writeInt(numReduces);
-    out.writeBoolean(historyCopied);
     out.writeLong(finishTime);
     out.writeLong(launchTime);
     out.writeInt(numOfSlotsPerMap);

Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java?rev=1077669&r1=1077668&r2=1077669&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
(original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
Fri Mar  4 04:42:18 2011
@@ -18,10 +18,18 @@
 
 package org.apache.hadoop.mapreduce.test.system;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.StringTokenizer;
 
 import junit.framework.Assert;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
@@ -30,16 +38,10 @@ import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.JobStatus;
 import org.apache.hadoop.mapred.JobTracker;
 import org.apache.hadoop.mapred.RunningJob;
-import org.apache.hadoop.mapreduce.JobID;
-import org.apache.hadoop.test.system.process.RemoteProcess;
 import org.apache.hadoop.mapred.TaskStatus;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.mapreduce.test.system.TaskInfo;
 import org.apache.hadoop.mapred.UtilsForTests;
-import static org.junit.Assert.*;
-import java.util.HashMap;
-import java.util.StringTokenizer;
+import org.apache.hadoop.mapreduce.JobID;
+import org.apache.hadoop.test.system.process.RemoteProcess;
 
 /**
  * JobTracker client for system tests.
@@ -167,17 +169,6 @@ public class JTClient extends MRDaemonCl
           org.apache.hadoop.mapred.JobID.downgrade(id));
     }
     verifyJobDetails(id);
-    JobInfo jobInfo = getJobInfo(id);
-    if(jobInfo != null) {
-      while(!jobInfo.isHistoryFileCopied()) {
-        Thread.sleep(1000);
-        LOG.info(id+" waiting for history file to copied");
-        jobInfo = getJobInfo(id);
-        if(jobInfo == null) {
-          break;
-        }
-      }
-    }
     verifyJobHistory(id);
   }
 

Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JobInfo.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JobInfo.java?rev=1077669&r1=1077668&r2=1077669&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JobInfo.java
(original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JobInfo.java
Fri Mar  4 04:42:18 2011
@@ -130,13 +130,6 @@ public interface JobInfo extends Writabl
   List<String> getBlackListedTrackers();
   
   /**
-   * Gets if the history file of the job is copied to the done 
-   * location <br/>
-   * 
-   * @return true if history file copied.
-   */
-  boolean isHistoryFileCopied();
-  /**
    * Get the launch time of a job.
    * @return long - launch time for a job.
    */



Mime
View raw message