hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r830230 [1/9] - in /hadoop/mapreduce/branches/HDFS-641: ./ .eclipse.templates/ conf/ ivy/ lib/ src/c++/ src/contrib/ src/contrib/capacity-scheduler/ src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ src/contrib/capacity-sche...
Date Tue, 27 Oct 2009 15:44:06 GMT
Author: omalley
Date: Tue Oct 27 15:43:58 2009
New Revision: 830230

URL: http://svn.apache.org/viewvc?rev=830230&view=rev
Log:
Additional merge from trunk

Added:
    hadoop/mapreduce/branches/HDFS-641/src/contrib/gridmix/README
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/gridmix/README
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/bin/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/bin/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/bin/mumak.sh
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/bin/mumak.sh
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/build.xml
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/build.xml
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/conf/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/conf/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/conf/log4j.properties
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/conf/log4j.properties
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/conf/mumak.xml
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/conf/mumak.xml
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/ivy/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/ivy/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/ivy.xml
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/ivy/libraries.properties
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/ivy/libraries.properties
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/AllMapsCompletedTaskAction.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/AllMapsCompletedTaskAction.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/EagerTaskInitializationListenerAspects.aj
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/EagerTaskInitializationListenerAspects.aj
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/HeartbeatEvent.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/HeartbeatEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/JobCompleteEvent.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/JobCompleteEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/JobSubmissionEvent.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/JobSubmissionEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorClock.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorClock.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEngine.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEngine.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEvent.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEventListener.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEventListener.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEventQueue.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorEventQueue.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobCache.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobCache.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobClient.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobClient.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobInProgress.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobInProgress.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStory.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStory.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStoryProducer.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobStoryProducer.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobTracker.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorJobTracker.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorLaunchTaskAction.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorLaunchTaskAction.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorTaskTracker.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorTaskTracker.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorTaskTrackerStatus.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/SimulatorTaskTrackerStatus.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/java/org/apache/hadoop/mapred/TaskAttemptCompletionEvent.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/java/org/apache/hadoop/mapred/TaskAttemptCompletionEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/data/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/data/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/data/19-jobs.topology.json.gz
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/data/19-jobs.topology.json.gz
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/data/19-jobs.trace.json.gz
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/data/19-jobs.trace.json.gz
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/CheckedEventQueue.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/CheckedEventQueue.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/FakeJobs.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/FakeJobs.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/HeartbeatHelper.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/HeartbeatHelper.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorEngine.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorEngine.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorJobTracker.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/MockSimulatorJobTracker.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEngine.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEngine.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEventQueue.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEventQueue.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobClient.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobClient.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobTracker.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobTracker.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorTaskTracker.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorTaskTracker.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/   (props changed)
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/.gitignore
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/.gitignore
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/Makefile
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/Makefile
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/Sqoop-manpage.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/Sqoop-manpage.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/SqoopUserGuide.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/SqoopUserGuide.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/classnames.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/classnames.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/connecting.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/connecting.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/controlling-input-format.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/controlling-input-format.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/controlling-output-format.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/controlling-output-format.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/direct.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/direct.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/full-db-import.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/full-db-import.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/hive.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/hive.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/input-formatting-args.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/input-formatting-args.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/input-formatting.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/input-formatting.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/intro.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/intro.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/listing-dbs.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/listing-dbs.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/listing-tables.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/listing-tables.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/misc-args.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/misc-args.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/output-formatting-args.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/output-formatting-args.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/output-formatting.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/output-formatting.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/supported-dbs.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/supported-dbs.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/doc/table-import.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/doc/table-import.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/readme.txt
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/readme.txt
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/SplittableBufferedWriter.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/SplittableBufferedWriter.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/SplittingOutputStream.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/io/SplittingOutputStream.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/SmokeTests.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/SmokeTests.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/io/
      - copied from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/io/
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/io/TestSplittableBufferedWriter.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/io/TestSplittableBufferedWriter.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/CommonArgs.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/CommonArgs.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingTaskLog.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingTaskLog.java
    hadoop/mapreduce/branches/HDFS-641/src/docs/src/documentation/content/xdocs/gridmix.xml
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/gridmix.xml
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/Utils.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/Utils.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestClusterStatus.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestClusterStatus.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobCleanup.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestJobCleanup.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobTrackerInstrumentation.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestJobTrackerInstrumentation.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestTaskStatus.java
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestTaskStatus.java
    hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/job-tracker-logs-trace-output.gz
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/job-tracker-logs-trace-output.gz
    hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/sample-job-tracker-logs.gz
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/sample-job-tracker-logs.gz
    hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/truncated-job-tracker-log
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/truncated-job-tracker-log
    hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/truncated-topology-output
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/truncated-topology-output
    hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/truncated-trace-output
      - copied unchanged from r830225, hadoop/mapreduce/trunk/src/test/tools/data/rumen/small-trace-test/truncated-trace-output
Removed:
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/readme.html
    hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/job-tracker-logs-trace-output
    hadoop/mapreduce/branches/HDFS-641/src/test/tools/data/rumen/small-trace-test/sample-job-tracker-logs
Modified:
    hadoop/mapreduce/branches/HDFS-641/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/.eclipse.templates/.classpath
    hadoop/mapreduce/branches/HDFS-641/.gitignore   (props changed)
    hadoop/mapreduce/branches/HDFS-641/CHANGES.txt
    hadoop/mapreduce/branches/HDFS-641/build.xml
    hadoop/mapreduce/branches/HDFS-641/conf/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template   (contents, props changed)
    hadoop/mapreduce/branches/HDFS-641/ivy/libraries.properties
    hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-0.22.0-dev.jar
    hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-test-0.22.0-dev.jar
    hadoop/mapreduce/branches/HDFS-641/src/c++/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml   (contents, props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/build.xml   (contents, props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/AbstractQueue.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ContainerQueue.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueHierarchyBuilder.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueSchedulingContext.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/TaskSchedulingContext.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/CapacityTestUtils.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerConf.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestContainerQueue.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestRefreshOfQueues.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/data_join/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/dynamic-scheduler/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/eclipse-plugin/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/fairscheduler/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/fairscheduler/ivy.xml
    hadoop/mapreduce/branches/HDFS-641/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerServlet.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/index/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/mrunit/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/build.xml
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/ivy.xml
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/ImportOptions.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/DirectPostgresqlManager.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/manager/LocalMySQLManager.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapred/ImportJob.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/AutoProgressMapper.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/mapreduce/DataDrivenImportJob.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/java/org/apache/hadoop/sqoop/util/DirectImportUtils.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/AllTests.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestAllTables.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestImportOptions.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestMultiMaps.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestSplitBy.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/TestWhere.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/hive/TestHiveImport.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/manager/MySQLAuthTest.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/manager/OracleManagerTest.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/orm/TestParseMethods.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/sqoop/src/test/org/apache/hadoop/sqoop/testutil/ImportJobTestCase.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleCachefiles.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestRawBytesStreaming.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamAggregate.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamDataProtocol.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamReduceNone.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreaming.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingCounters.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingEmptyInpNonemptyOut.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingFailure.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingKeyValue.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingSeparator.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestTypedBytesStreaming.java
    hadoop/mapreduce/branches/HDFS-641/src/contrib/vaidya/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml
    hadoop/mapreduce/branches/HDFS-641/src/docs/src/documentation/content/xdocs/site.xml
    hadoop/mapreduce/branches/HDFS-641/src/examples/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/examples/org/apache/hadoop/examples/dancing/Pentomino.java
    hadoop/mapreduce/branches/HDFS-641/src/examples/org/apache/hadoop/examples/dancing/Sudoku.java
    hadoop/mapreduce/branches/HDFS-641/src/examples/org/apache/hadoop/examples/pi/DistSum.java
    hadoop/mapreduce/branches/HDFS-641/src/examples/org/apache/hadoop/examples/terasort/TeraOutputFormat.java
    hadoop/mapreduce/branches/HDFS-641/src/java/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/java/mapred-default.xml
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/ClusterStatus.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/EagerTaskInitializationListener.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/FileOutputCommitter.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobConf.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobInProgress.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobPriority.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobStatus.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobTracker.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobTrackerInstrumentation.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/JobTrackerMetricsInst.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/OutputCommitter.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/OutputLogFilter.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/Task.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskInProgress.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskLog.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskMemoryManagerThread.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskRunner.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskStatus.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/TaskTracker.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapred/pipes/Submitter.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/ClusterMetrics.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/JobContext.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/MapContext.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/OutputCommitter.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/ReduceContext.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/TaskAttemptContext.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/TaskInputOutputContext.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/filecache/DistributedCache.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/filecache/TaskDistributedCacheManager.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/filecache/TrackerDistributedCacheManager.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/EventReader.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/Events.avpr
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/HistoryEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobFinishedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobInfoChangeEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobInitedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobPriorityChangeEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobStatusChangedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobSubmittedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/JobUnsuccessfulCompletionEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/MapAttemptFinishedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/ReduceAttemptFinishedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskAttemptFinishedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskAttemptStartedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskAttemptUnsuccessfulCompletionEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskFailedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskFinishedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskStartedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/jobhistory/TaskUpdatedEvent.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java
    hadoop/mapreduce/branches/HDFS-641/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java
    hadoop/mapreduce/branches/HDFS-641/src/test/findbugsExcludeFile.xml
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/conf/TestJobConf.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/conf/TestNoDefaultsJobConf.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/ClusterWithLinuxTaskController.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/FakeObjectUtilities.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestBadRecords.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestComparators.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestEmptyJob.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestFileOutputCommitter.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJavaSerialization.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobHistory.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobKillAndFail.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobName.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestLazyOutput.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestMapredHeartbeat.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRClasspath.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRDFSSort.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRWithDFS.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestParallelInitialization.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestResourceEstimation.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerBlacklisting.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestTextInputFormat.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestTrackerDistributedCacheManagerWithLinuxTaskController.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestTrackerReservation.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/TestUserDefinedCounters.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/UtilsForTests.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/join/TestDatamerge.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/lib/TestKeyFieldBasedComparator.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapred/pipes/TestPipes.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/MapReduceTestUtil.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduceLazyOutput.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/TestValueIterReset.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestTrackerDistributedCacheManager.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/lib/aggregate/TestMapReduceAggregates.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinDatamerge.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedComparator.java
    hadoop/mapreduce/branches/HDFS-641/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenJobTraces.java
    hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java
    hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java
    hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedJob.java
    hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedLocation.java
    hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java
    hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java
    hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedTask.java
    hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
    hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java
    hadoop/mapreduce/branches/HDFS-641/src/tools/org/apache/hadoop/tools/rumen/ZombieJobProducer.java
    hadoop/mapreduce/branches/HDFS-641/src/webapps/job/   (props changed)
    hadoop/mapreduce/branches/HDFS-641/src/webapps/job/jobtable.jsp
    hadoop/mapreduce/branches/HDFS-641/src/webapps/job/jobtracker.jsp
    hadoop/mapreduce/branches/HDFS-641/src/webapps/job/jobtracker.jspx

Propchange: hadoop/mapreduce/branches/HDFS-641/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 15:43:58 2009
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19/mapred:713112
-/hadoop/mapreduce/trunk:817879-818559
+/hadoop/mapreduce/trunk:817878-830225

Modified: hadoop/mapreduce/branches/HDFS-641/.eclipse.templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/.eclipse.templates/.classpath?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/.eclipse.templates/.classpath (original)
+++ hadoop/mapreduce/branches/HDFS-641/.eclipse.templates/.classpath Tue Oct 27 15:43:58 2009
@@ -25,11 +25,11 @@
 	<classpathentry kind="src" path="src/contrib/vaidya/src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-core-0.21.0-dev.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-core-test-0.21.0-dev.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-hdfs-0.21.0-dev.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-hdfs-test-0.21.0-dev.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/avro-1.0.0.jar"/>
+	<classpathentry kind="lib" path="lib/hadoop-core-0.22.0-dev.jar"/>
+	<classpathentry kind="lib" path="lib/hadoop-core-test-0.22.0-dev.jar"/>
+	<classpathentry kind="lib" path="lib/hadoop-hdfs-0.22.0-dev.jar"/>
+	<classpathentry kind="lib" path="lib/hadoop-hdfs-test-0.22.0-dev.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/avro-1.2.0.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-cli-1.2.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-codec-1.3.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-el-1.0.jar"/>
@@ -54,12 +54,13 @@
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/oro-2.0.8.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/paranamer-1.5.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/servlet-api-2.5-6.1.14.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/slf4j-api-1.4.3.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/slf4j-log4j12-1.4.3.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/slf4j-api-1.5.8.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/slf4j-simple-1.5.8.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/xmlenc-0.52.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/index/common/lucene-core-2.3.1.jar"/>
 	<classpathentry kind="lib" path="build/test/classes"/>
 	<classpathentry kind="lib" path="build/classes"/>
 	<classpathentry kind="lib" path="conf"/>
+	<classpathentry kind="lib" path="build/ivy/lib/sqoop/common/commons-io-1.4.jar"/>
 	<classpathentry kind="output" path="build/eclipse-classes"/>
 </classpath>

Propchange: hadoop/mapreduce/branches/HDFS-641/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 15:43:58 2009
@@ -1,3 +1,4 @@
+/hadoop/core/branches/HADOOP-4687/mapred/.gitignore:776175-784965
 /hadoop/core/branches/branch-0.19/mapred/.gitignore:713112
 /hadoop/core/trunk/.gitignore:784664-785643
-/hadoop/mapreduce/trunk/.gitignore:817879-818559
+/hadoop/mapreduce/trunk/.gitignore:817878-830225

Modified: hadoop/mapreduce/branches/HDFS-641/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/CHANGES.txt?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/HDFS-641/CHANGES.txt Tue Oct 27 15:43:58 2009
@@ -6,14 +6,48 @@
 
   NEW FEATURES
 
+    MAPREDUCE-1017. Compression and output splitting for Sqoop.
+    (Aaron Kimball via tomwhite)
+
   IMPROVEMENTS
 
+    MAPREDUCE-999. Improve Sqoop test speed and refactor tests.
+    (Aaron Kimball via tomwhite)
+
+    MAPREDUCE-906. Update Sqoop documentation. (Aaron Kimball via cdouglas)
+
+    MAPREDUCE-947. Added commitJob and abortJob apis to OutputCommitter.
+    Enhanced FileOutputCommitter to create a _SUCCESS file for successful
+    jobs. (Amar Kamat & Jothi Padmanabhan via acmurthy) 
+
+    MAPREDUCE-1103. Added more metrics to Jobtracker. (sharad) 
+
+    MAPREDUCE-1048. Add occupied/reserved slot usage summary on jobtracker UI.
+    (Amareshwari Sriramadasu and Hemanth Yamijala via sharad)
+
+    MAPREDUCE-1090. Modified log statement in TaskMemoryManagerThread to
+    include task attempt id. (yhemanth)
+
   OPTIMIZATIONS
 
+    MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band
+    heartbeat on task-completion for better job-latency. (acmurthy) 
+    Configuration changes:
+      add mapreduce.tasktracker.outofband.heartbeat 
+
   BUG FIXES
 
     MAPREDUCE-1014. Fix the libraries for common and hdfs. (omalley)
 
+    MAPREDUCE-1111. JT Jetty UI not working if we run mumak.sh 
+    off packaged distribution directory. (hong tang via mahadev)
+
+    MAPREDUCE-1133. Eclipse .classpath template has outdated jar files and is
+    missing some new ones. (cos)
+
+    MAPREDUCE-1098. Fixed the distributed-cache to not do i/o while holding a
+    global lock. (Amareshwari Sriramadasu via acmurthy)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES
@@ -137,6 +171,9 @@
 
     MAPREDUCE-980. Modify JobHistory to use Avro for serialization. (cutting)
 
+    MAPREDUCE-728. Add Mumak, a Hadoop map/reduce simulator. (Arun C Murthy,
+    Tamas Sarlos, Anirban Dasgupta, Guanying Wang, and Hong Tang via cdouglas)
+
   IMPROVEMENTS
 
     MAPREDUCE-816. Rename "local" mysql import to "direct" in Sqoop.
@@ -427,6 +464,14 @@
 
     HDFS-663. DFSIO for append. (shv)
 
+    MAPREDUCE-1063. Document gridmix benchmark. (cdouglas)
+
+    MAPREDUCE-931. Use built-in interpolation classes for making up task
+    runtimes in Rumen. (Dick King via cdouglas)
+
+    MAPREDUCE-1012. Mark Context interfaces as public evolving. (Tom White via
+    cdouglas)
+
   BUG FIXES
 
     MAPREDUCE-878. Rename fair scheduler design doc to 
@@ -723,3 +768,61 @@
     MAPREDUCE-1022. Fix compilation of vertica testcases. (Vinod Kumar 
     Vavilapalli via acmurthy)
 
+    MAPREDUCE-1000. Handle corrupt history files in JobHistory.initDone().
+    (Jothi Padmanabhan via sharad)
+
+    MAPREDUCE-1028. Fixed number of slots occupied by cleanup tasks to one
+    irrespective of slot size for the job.
+    (Ravi Gummadi via yhemanth)
+
+    MAPREDUCE-964. Fixed start and finish times of TaskStatus to be
+    consistent, thereby fixing inconsistencies in metering tasks.
+    (Sreekanth Ramakrishnan via yhemanth)
+
+    MAPREDUCE-1076. Deprecate ClusterStatus and add javadoc in ClusterMetrics.
+    (Amareshwari Sriramadasu via sharad)
+
+    MAPREDUCE-979. Fixed JobConf APIs related to memory parameters to return
+    values of new configuration variables when deprecated variables are
+    disabled. (Sreekanth Ramakrishnan via yhemanth)
+   
+    MAPREDUCE-1030. Modified scheduling algorithm to return a map and reduce
+    task per heartbeat in the capacity scheduler.
+    (Rahul Kumar Singh via yhemanth)
+
+    MAPREDUCE-1071. Use DataInputStream rather than FSDataInputStream in the
+    JobHistory EventReader. (Hong Tang via cdouglas)
+
+    MAPREDUCE-986. Fix Rumen to work with truncated task lines. (Dick King via
+    cdouglas)
+
+    MAPREDUCE-1029. Fix failing TestCopyFiles by restoring the unzipping of
+    HDFS webapps from the hdfs jar. (Aaron Kimball and Jothi Padmanabhan via
+    cdouglas)
+
+    MAPREDUCE-769. Make findbugs and javac warnings to zero.
+    (Amareshwari Sriramadasu via sharad)
+
+    MAPREDUCE-1104. Initialize RecoveryManager in JobTracker cstr called by
+    Mumak. (Hong Tang via cdouglas)
+
+    MAPREDUCE-1061. Add unit test validating byte specifications for gridmix
+    jobs. (cdouglas)
+
+    MAPREDUCE-1077. Fix Rumen so that truncated tasks do not mark the job as
+    successful. (Dick King via cdouglas)
+
+    MAPREDUCE-1041. Make TaskInProgress::taskStatuses map package-private.
+    (Jothi Padmanabhan via cdouglas)
+
+    MAPREDUCE-1070. Prevent a deadlock in the fair scheduler servlet.
+    (Todd Lipcon via cdouglas)
+
+    MAPREDUCE-1086. Setup Hadoop logging environment for tasks to point to
+    task related parameters. (Ravi Gummadi via yhemanth)
+
+    MAPREDUCE-1105. Remove max limit configuration in capacity scheduler in
+    favor of max capacity percentage thus allowing the limit to go over
+    queue capacity. (Rahul Kumar Singh via yhemanth)
+
+    MAPREDUCE-1016.  Make the job history log format JSON.  (cutting)

Modified: hadoop/mapreduce/branches/HDFS-641/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/build.xml?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/build.xml (original)
+++ hadoop/mapreduce/branches/HDFS-641/build.xml Tue Oct 27 15:43:58 2009
@@ -292,6 +292,15 @@
       </fileset>
     </copy>
 
+     <unzip src="${lib.dir}/hadoop-hdfs-${hadoop-hdfs.version}.jar"
+         dest="${build.dir}">
+       <patternset>
+         <include name="webapps/hdfs/**"/>
+         <include name="webapps/datanode/**"/>
+         <include name="webapps/secondary/**"/>
+       </patternset>
+     </unzip>
+
     <copy todir="${conf.dir}" verbose="true">
       <fileset dir="${conf.dir}" includes="**/*.template"/>
       <mapper type="glob" from="*.template" to="*"/>
@@ -689,6 +698,7 @@
       <property name="dist.dir" value="${dist.dir}"/>
       <fileset file="${contrib.dir}/streaming/build.xml"/>
       <fileset file="${contrib.dir}/gridmix/build.xml"/>
+      <fileset file="${contrib.dir}/mumak/build.xml"/>
     </subant>
  </target>
 
@@ -719,11 +729,13 @@
       <sourcePath path="${tools.src}" />
       <sourcePath path="${basedir}/src/contrib/streaming/src/java" />
       <sourcePath path="${basedir}/src/contrib/gridmix/src/java" />
+      <sourcePath path="${basedir}/src/contrib/mumak/src/java" />
       <class location="${basedir}/build/${final.name}.jar" />
       <class location="${basedir}/build/${examples.final.name}.jar" />
       <class location="${basedir}/build/${tools.final.name}.jar" />
       <class location="${basedir}/build/contrib/streaming/hadoop-${version}-streaming.jar" />
       <class location="${basedir}/build/contrib/gridmix/hadoop-${version}-gridmix.jar" />
+      <class location="${basedir}/build/contrib/mumak/hadoop-${version}-mumak.jar" />
     </findbugs>
 
         <xslt style="${findbugs.home}/src/xsl/default.xsl"
@@ -784,6 +796,7 @@
     	<packageset dir="src/contrib/data_join/src/java"/>
     	<packageset dir="src/contrib/index/src/java"/>
     	<packageset dir="src/contrib/gridmix/src/java"/>
+    	<packageset dir="src/contrib/mumak/src/java"/>
 
         <link href="${javadoc.link.java}"/>
 
@@ -794,6 +807,7 @@
           </fileset>
           <path refid="javadoc-classpath"/>
           <pathelement path="${java.class.path}"/>
+          <pathelement path="${lib.dir}/hadoop-core-test-${hadoop-core.version}.jar"/>
           <pathelement location="${build.tools}"/>
         </classpath>
 
@@ -838,6 +852,7 @@
     	<packageset dir="src/contrib/data_join/src/java"/>
     	<packageset dir="src/contrib/index/src/java"/>
     	<packageset dir="src/contrib/gridmix/src/java"/>
+    	<packageset dir="src/contrib/mumak/src/java"/>
 	
         <link href="${javadoc.link.java}"/>
 
@@ -848,6 +863,7 @@
           </fileset>
           <path refid="javadoc-classpath"/>
           <pathelement path="${java.class.path}"/>
+          <pathelement path="${lib.dir}/hadoop-core-test-${hadoop-core.version}.jar"/>
           <pathelement location="${build.tools}"/>
         </classpath>
 

Propchange: hadoop/mapreduce/branches/HDFS-641/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 15:43:58 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/conf:713112
 /hadoop/core/trunk/conf:784664-785643
-/hadoop/mapreduce/trunk/conf:817879-818559
+/hadoop/mapreduce/trunk/conf:817878-830225

Modified: hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template (original)
+++ hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template Tue Oct 27 15:43:58 2009
@@ -69,44 +69,6 @@
     </description>
   </property>
 
-<property>
-  <name>mapred.capacity-scheduler.queue.default.max.map.slots</name>
-  <value>-1</value>
-  <description>
-    This value is the maximum map slots that can be used in a
-    queue at any point of time. So for example assuming above config value
-    is 100 , not more than 100 tasks would be in the queue at any point of
-    time, assuming each task takes one slot.
-
-    Default value of -1 would disable this capping feature
-
-    Typically the queue capacity should be equal to this limit.
-    If queue capacity is more than this limit, excess capacity will be
-    used by the other queues. If queue capacity is less than the above
-    limit , then the limit would be the queue capacity - as in the current
-    implementation
-  </description>
-</property>
-
-<property>
-  <name>mapred.capacity-scheduler.queue.default.max.reduce.slots</name>
-  <value>-1</value>
-  <description>
-    This value is the maximum reduce slots that can be used in a
-    queue at any point of time. So for example assuming above config value
-      is 100 , not more than 100 reduce tasks would be in the queue at any point
-      of time, assuming each task takes one slot.
-
-    Default value of -1 would disable this capping feature
-
-    Typically the queue capacity should be equal to this limit.
-    If queue capacity is more than this limit, excess capacity will be
-    used by the other queues. If queue capacity is less than the above
-    limit , then the limit would be the queue capacity - as in the current
-    implementation
-  </description>
-</property>
-  
   <!-- The default configuration settings for the capacity task scheduler -->
   <!-- The default values would be applied to all the queues which don't have -->
   <!-- the appropriate property for the particular queue -->

Propchange: hadoop/mapreduce/branches/HDFS-641/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 15:43:58 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/conf/capacity-scheduler.xml.template:713112
 /hadoop/core/trunk/conf/capacity-scheduler.xml.template:776175-785643
-/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:817879-818559
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:817878-830225

Modified: hadoop/mapreduce/branches/HDFS-641/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/ivy/libraries.properties?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/ivy/libraries.properties (original)
+++ hadoop/mapreduce/branches/HDFS-641/ivy/libraries.properties Tue Oct 27 15:43:58 2009
@@ -16,7 +16,7 @@
 #These are the versions of our dependencies (in alphabetical order)
 apacheant.version=1.7.0
 
-avro.version=1.1.0
+avro.version=1.2.0
 
 checkstyle.version=4.2
 

Modified: hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-0.22.0-dev.jar
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-0.22.0-dev.jar?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-test-0.22.0-dev.jar
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/lib/hadoop-core-test-0.22.0-dev.jar?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
Binary files - no diff available.

Propchange: hadoop/mapreduce/branches/HDFS-641/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 15:43:58 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/c++:713112
 /hadoop/core/trunk/src/c++:776175-784663
-/hadoop/mapreduce/trunk/src/c++:817879-818559
+/hadoop/mapreduce/trunk/src/c++:817878-830225

Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 15:43:58 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
 /hadoop/core/trunk/src/contrib:784664-785643
-/hadoop/mapreduce/trunk/src/contrib:817879-818559
+/hadoop/mapreduce/trunk/src/contrib:817878-830225

Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml (original)
+++ hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml Tue Oct 27 15:43:58 2009
@@ -32,6 +32,7 @@
   <property name="hadoop.root" location="${root}/../../../"/>
   <property name="src.dir"  location="${root}/src/java"/>
   <property name="src.test" location="${root}/src/test"/>
+  <property name="src.test.data" location="${root}/src/test/data"/>
   <property name="src.examples" location="${root}/src/examples"/>
 
   <available file="${src.examples}" type="dir" property="examples.available"/>
@@ -70,8 +71,7 @@
   <property name="ivy.jar" location="${hadoop.root}/ivy/ivy-${ivy.version}.jar"/>
   <property name="ivy_repo_url" 
 	value="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" />
-  <property name="build.dir" location="build" />
-  <property name="build.ivy.dir" location="${build.dir}/ivy" />
+  <property name="build.ivy.dir" location="${hadoop.root}/build/ivy" />
   <property name="build.ivy.lib.dir" location="${build.ivy.dir}/lib" />
   <property name="build.ivy.report.dir" location="${build.ivy.dir}/report" />
   <property name="common.ivy.lib.dir" location="${build.ivy.lib.dir}/${ant.project.name}/common"/> 
@@ -149,7 +149,7 @@
   <!-- ======================================================= -->
   <!-- Compile a Hadoop contrib's example files (if available) -->
   <!-- ======================================================= -->
-  <target name="compile-examples" depends="compile" if="examples.available">
+  <target name="compile-examples" depends="compile, ivy-retrieve-common" if="examples.available">
     <echo message="contrib: ${name}"/>
     <javac
      encoding="${build.encoding}"
@@ -232,6 +232,7 @@
       <sysproperty key="test.build.data" value="${build.test}/data"/>
       <sysproperty key="build.test" value="${build.test}"/>
       <sysproperty key="test.build.extraconf" value="${test.build.extraconf}" />
+      <sysproperty key="src.test.data" value="${src.test.data}"/>
       <sysproperty key="contrib.name" value="${name}"/>
       
       <!-- requires fork=yes for: 

Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 15:43:58 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
 /hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:817879-818559
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:817878-830225

Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/build.xml?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/src/contrib/build.xml (original)
+++ hadoop/mapreduce/branches/HDFS-641/src/contrib/build.xml Tue Oct 27 15:43:58 2009
@@ -58,6 +58,7 @@
       <fileset dir="." includes="dynamic-scheduler/build.xml"/>
       <fileset dir="." includes="gridmix/build.xml"/>
       <fileset dir="." includes="vertica/build.xml"/>
+      <fileset dir="." includes="mumak/build.xml"/>
     </subant>
     <available file="${build.contrib.dir}/testsfailed" property="testsfailed"/>
     <fail if="testsfailed">Tests failed!</fail>

Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 15:43:58 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
 /hadoop/core/trunk/src/contrib/build.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build.xml:817879-818559
+/hadoop/mapreduce/trunk/src/contrib/build.xml:817878-830225

Propchange: hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 27 15:43:58 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/capacity-scheduler:713112
 /hadoop/core/trunk/src/contrib/capacity-scheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:817879-818559
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:817878-830225

Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/AbstractQueue.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/AbstractQueue.java?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/AbstractQueue.java (original)
+++ hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/AbstractQueue.java Tue Oct 27 15:43:58 2009
@@ -241,15 +241,8 @@
     sourceContext.setNumJobsByUser(qsc.getNumJobsByUser());
     sourceContext.setNumOfWaitingJobs(qsc.getNumOfWaitingJobs());
 
-    // Task limits are already read from the configuration. Cache them and set
-    // them in the old hierarchy along with the map/reduce TSCs.
-    int maxMapTaskLimit = sourceContext.getMapTSC().getMaxTaskLimit();
-    int maxReduceTaskLimit = sourceContext.getReduceTSC().getMaxTaskLimit();
     sourceContext.setMapTSC(qsc.getMapTSC());
     sourceContext.setReduceTSC(qsc.getReduceTSC());
-    sourceContext.getMapTSC().setMaxTaskLimit(maxMapTaskLimit);
-    sourceContext.getReduceTSC().setMaxTaskLimit(maxReduceTaskLimit);
-
     setQueueSchedulingContext(sourceContext);
 
     if (LOG.isDebugEnabled()) {

Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java (original)
+++ hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java Tue Oct 27 15:43:58 2009
@@ -106,17 +106,6 @@
    * cannot use the capacity of its parent queue.
    */
   static final String MAX_CAPACITY_PROPERTY ="maximum-capacity";
-  /**
-   *  Configuration that provides the maximum cap for the map task in a queue
-   *  at any given point of time.
-   */
-  static final String MAX_MAP_CAP_PROPERTY = "max.map.slots";
-
-  /**
-   *  Configuration that provides the maximum cap for the reduce task in a queue
-   *  at any given point of time.
-   */
-  static final String MAX_REDUCE_CAP_PROPERTY = "max.reduce.slots";
 
   /**
    * The constant which defines the default initialization thread
@@ -223,7 +212,8 @@
   }
 
   /**
-   * Get maximum percentage stretch for a queue.
+   * Return the maximum percentage of the cluster capacity that can be
+   * used by the given queue
    * This percentage defines a limit beyond which a
    * sub-queue cannot use the capacity of its parent queue.
    * This provides a means to limit how much excess capacity a
@@ -232,8 +222,8 @@
    * The maximum-capacity-stretch of a queue can only be
    * greater than or equal to its minimum capacity.
    * 
-   * @param queue
-   * @return
+   * @param queue name of the queue
+   * @return maximum capacity percent of cluster for the queue
    */
   public float getMaxCapacity(String queue) {
     String raw = getProperty(queue, MAX_CAPACITY_PROPERTY);
@@ -367,28 +357,6 @@
     return maxWorkerThreads;
   }
 
-  /**
-   * get the max map slots cap
-   * @param queue
-   * @return
-   */
-  public int getMaxMapCap(String queue) {
-    String raw = getProperty(queue, MAX_MAP_CAP_PROPERTY);
-    return getInt(raw,-1);
-  }
-
-
-  /**
-   * get the max reduce slots cap
-   * @param queue
-   * @return
-   */
-  public int getMaxReduceCap(String queue) {
-    String raw = getProperty(queue, MAX_REDUCE_CAP_PROPERTY);
-    return getInt(raw,-1);
-  }
-
-
   public Configuration getCSConf() {
     return rmConf;
   }

Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java (original)
+++ hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java Tue Oct 27 15:43:58 2009
@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -288,6 +287,12 @@
         // only look at jobs that can be run. We ignore jobs that haven't
         // initialized, or have completed but haven't been removed from the
         // running queue.
+
+        //Check queue for maximum capacity .
+        if(areTasksInQueueOverMaxCapacity(qsi,j.getNumSlotsPerTask(type))) {
+          continue;
+        }
+        
         if (j.getStatus().getRunState() != JobStatus.RUNNING) {
           continue;
         }
@@ -357,6 +362,13 @@
         if (j.getStatus().getRunState() != JobStatus.RUNNING) {
           continue;
         }
+
+        //Check for the maximum-capacity.
+        if(areTasksInQueueOverMaxCapacity(qsi,j.getNumSlotsPerTask(type))) {
+          continue;
+        }
+
+
         if (scheduler.memoryMatcher.matchesMemoryRequirements(j, type,
             taskTrackerStatus)) {
           // We found a suitable job. Get task from it.
@@ -442,9 +454,12 @@
           continue;
         }
 
-        if(this.areTasksInQueueOverLimit(qsc)) {
+        //This call is important for optimization purposes , if we
+        //have reached the limit already no need for traversing the queue.
+        if(this.areTasksInQueueOverMaxCapacity(qsc,1)) {
           continue;
         }
+        
         TaskLookupResult tlr = getTaskFromQueue(taskTracker, qsc);
         TaskLookupResult.LookUpStatus lookUpStatus = tlr.getLookUpStatus();
 
@@ -469,37 +484,30 @@
 
 
     /**
-     * Check if the max task limit is set for this queue
-     * if set , ignore this qsc if current num of occupied
-     * slots  of a TYPE in the queue is >= getMaxTaskCap() or
-     * if they have reached there Max Capacity.
+     * Check if maximum-capacity is set  for this queue.
+     * If set and greater than 0 ,
+     * check if numofslotsoccupied+numSlotsPerTask is greater than
+     * maximum-Capacity ,if yes , implies this queue is over limit.
+     *
+     * Incase noOfSlotsOccupied is less than maximum-capacity ,but ,
+     * numOfSlotsOccupied+noSlotsPerTask is more than maximum-capacity we still
+     * dont assign the task . This may lead to under utilization of very small
+     * set of slots. But this is ok ,as we strictly respect the maximum-capacity
      * @param qsc
-     * @return
+     * @param noOfSlotsPerTask
+     * @return true if queue is over maximum-capacity
      */
-
-    private boolean areTasksInQueueOverLimit(
-      QueueSchedulingContext qsc) {
+    private boolean areTasksInQueueOverMaxCapacity(
+      QueueSchedulingContext qsc,int noOfSlotsPerTask) {
       TaskSchedulingContext tsi = getTSC(qsc);
-      //check for maxTaskLimit
-
-      if (tsi.getMaxTaskLimit() >= 0) {
-        if (tsi.getNumSlotsOccupied() >= tsi.getCapacity()) {
-          if (LOG.isDebugEnabled()) {
-            LOG.debug(
-              "Queue " + qsc.getQueueName() + " has reached its  max " + type +
-                " limit ");
-            LOG.debug("Current running tasks " + tsi.getCapacity());
-          }
-          return true;
-        }
-      }
-
+      //check for maximum-capacity
       if(tsi.getMaxCapacity() >= 0) {
-        if(tsi.getNumSlotsOccupied() >= tsi.getMaxCapacity()) {
-          if(LOG.isDebugEnabled()) {
+        if ((tsi.getNumSlotsOccupied() + noOfSlotsPerTask) >
+          tsi.getMaxCapacity()) {
+          if (LOG.isDebugEnabled()) {
             LOG.debug(
-              "Queue " + qsc.getQueueName() + " " +
-                "has reached its  max " + type + "Capacity"  ); 
+              "Queue " + qsc.getQueueName() + " " + "has reached its  max " +
+                type + "Capacity");
             LOG.debug("Current running tasks " + tsi.getCapacity());
 
           }
@@ -523,11 +531,11 @@
           s.append(
             String.format(
               " Queue '%s'(%s): runningTasks=%d, "
-                + "occupiedSlots=%d, capacity=%d, runJobs=%d  maxTaskLimit=%d ",
+                + "occupiedSlots=%d, capacity=%d, runJobs=%d  maximumCapacity=%d ",
               qsi.getQueueName(),
               this.type, tsi.getNumRunningTasks(),
               tsi.getNumSlotsOccupied(), tsi.getCapacity(), (runJobs.size()),
-              tsi.getMaxTaskLimit()));
+              tsi.getMaxCapacity()));
         }
         LOG.debug(s);
       }
@@ -906,8 +914,10 @@
 
   /*
    * The grand plan for assigning a task. 
-   * First, decide whether a Map or Reduce task should be given to a TT 
-   * (if the TT can accept either). 
+   * Always assigns 1 reduce and 1 map , if sufficient slots are
+   * available for each of types.
+   * If not , then which ever type of slots are available , that type of task is
+   * assigned.
    * Next, pick a queue. We only look at queues that need a slot. Among these,
    * we first look at queues whose (# of running tasks)/capacity is the least.
    * Next, pick a job in a queue. we pick the job at the front of the queue
@@ -921,12 +931,12 @@
     
     TaskLookupResult tlr;
     TaskTrackerStatus taskTrackerStatus = taskTracker.getStatus();
+    List<Task> result = new ArrayList<Task>();
     
     /* 
-     * If TT has Map and Reduce slot free, we need to figure out whether to
-     * give it a Map or Reduce task.
-     * Number of ways to do this. For now, base decision on how much is needed
-     * versus how much is used (default to Map, if equal).
+     * If TT has Map and Reduce slot free, we assign 1 map and 1 reduce
+     * We  base decision on how much is needed
+     * versus how much is used
      */
     ClusterStatus c = taskTrackerManager.getClusterStatus();
     int mapClusterCapacity = c.getMaxMapTasks();
@@ -953,51 +963,26 @@
     // make sure we get our map or reduce scheduling object to update its 
     // collection of QSC objects too.
 
-    if ((maxReduceSlots - currentReduceSlots) > 
-    (maxMapSlots - currentMapSlots)) {
-      // get a reduce task first
+    if (maxReduceSlots > currentReduceSlots) {
+      //reduce slot available , try to get a
+      //reduce task
       tlr = reduceScheduler.assignTasks(taskTracker);
       if (TaskLookupResult.LookUpStatus.TASK_FOUND == 
         tlr.getLookUpStatus()) {
-        // found a task; return
-        return Collections.singletonList(tlr.getTask());
-      }
-      // if we didn't get any, look at map tasks, if TT has space
-      else if ((TaskLookupResult.LookUpStatus.TASK_FAILING_MEMORY_REQUIREMENT
-                                  == tlr.getLookUpStatus() ||
-                TaskLookupResult.LookUpStatus.NO_TASK_FOUND
-                                  == tlr.getLookUpStatus())
-          && (maxMapSlots > currentMapSlots)) {
-        tlr = mapScheduler.assignTasks(taskTracker);
-        if (TaskLookupResult.LookUpStatus.TASK_FOUND == 
-          tlr.getLookUpStatus()) {
-          return Collections.singletonList(tlr.getTask());
-        }
+        result.add(tlr.getTask());
       }
     }
-    else {
-      // get a map task first
+
+    if(maxMapSlots > currentMapSlots) {
+      //map slot available , try to get a map task
       tlr = mapScheduler.assignTasks(taskTracker);
       if (TaskLookupResult.LookUpStatus.TASK_FOUND == 
         tlr.getLookUpStatus()) {
-        // found a task; return
-        return Collections.singletonList(tlr.getTask());
-      }
-      // if we didn't get any, look at reduce tasks, if TT has space
-      else if ((TaskLookupResult.LookUpStatus.TASK_FAILING_MEMORY_REQUIREMENT
-                                    == tlr.getLookUpStatus()
-                || TaskLookupResult.LookUpStatus.NO_TASK_FOUND
-                                    == tlr.getLookUpStatus())
-          && (maxReduceSlots > currentReduceSlots)) {
-        tlr = reduceScheduler.assignTasks(taskTracker);
-        if (TaskLookupResult.LookUpStatus.TASK_FOUND == 
-          tlr.getLookUpStatus()) {
-          return Collections.singletonList(tlr.getTask());
-        }
+        result.add(tlr.getTask());
       }
     }
-
-    return null;
+    
+    return (result.isEmpty()) ? null : result;
   }
 
   

Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ContainerQueue.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ContainerQueue.java?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ContainerQueue.java (original)
+++ hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ContainerQueue.java Tue Oct 27 15:43:58 2009
@@ -172,6 +172,15 @@
       //We dont have to check for 100 - totalCapacity being -ve , as
       //we already do it while loading.
       for (AbstractQueue q : unConfiguredQueues) {
+        if(q.qsc.getMaxCapacityPercent() > 0) {
+          if (q.qsc.getMaxCapacityPercent() < capacityShare) {
+            throw new IllegalStateException(
+              " Capacity share (" + capacityShare + ")for unconfigured queue " +
+                q.getName() +
+                " is greater than its maximum-capacity percentage " +
+                q.qsc.getMaxCapacityPercent());
+          }
+        }
         q.qsc.setCapacityPercent(capacityShare);
         LOG.info("Capacity share for un configured queue " + q.getName() + "" +
           " is " + capacityShare);

Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueHierarchyBuilder.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueHierarchyBuilder.java?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueHierarchyBuilder.java (original)
+++ hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueHierarchyBuilder.java Tue Oct 27 15:43:58 2009
@@ -161,9 +161,8 @@
     int ulMin = schedConf.getMinimumUserLimitPercent(queueName);
     // create our QSC and add to our hashmap
     QueueSchedulingContext qsi = new QueueSchedulingContext(
-      queueName, capacity, stretchCapacity, ulMin,
-      schedConf.getMaxMapCap(
-        queueName), schedConf.getMaxReduceCap(queueName));
+      queueName, capacity, stretchCapacity, ulMin
+    );
     qsi.setSupportsPriorities(
       schedConf.isPrioritySupported(
         queueName));
@@ -179,7 +178,7 @@
    */
   static AbstractQueue createRootAbstractQueue() {
     QueueSchedulingContext rootContext =
-        new QueueSchedulingContext("", 100, -1, -1, -1, -1);
+        new QueueSchedulingContext("", 100, -1, -1);
     AbstractQueue root = new ContainerQueue(null, rootContext);
     return root;
   }

Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueSchedulingContext.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueSchedulingContext.java?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueSchedulingContext.java (original)
+++ hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/QueueSchedulingContext.java Tue Oct 27 15:43:58 2009
@@ -100,17 +100,14 @@
 
   QueueSchedulingContext(
     String queueName, float capacityPercent, float maxCapacityPercent,
-    int ulMin,
-    int mapCap, int reduceCap) {
-      this.setQueueName(new String(queueName));
-      this.setCapacityPercent(capacityPercent);
-      this.setMaxCapacityPercent(maxCapacityPercent);
-      this.setUlMin(ulMin);
-      this.setMapTSC(new TaskSchedulingContext(TaskType.MAP));
-      this.setReduceTSC(new TaskSchedulingContext(TaskType.REDUCE));
-      this.getMapTSC().setMaxTaskLimit(mapCap);
-      this.getReduceTSC().setMaxTaskLimit(reduceCap);
-    }
+    int ulMin) {
+    this.setQueueName(new String(queueName));
+    this.setCapacityPercent(capacityPercent);
+    this.setMaxCapacityPercent(maxCapacityPercent);
+    this.setUlMin(ulMin);
+    this.setMapTSC(new TaskSchedulingContext(TaskType.MAP));
+    this.setReduceTSC(new TaskSchedulingContext(TaskType.REDUCE));
+  }
 
   /**
      * return information about the queue

Modified: hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/TaskSchedulingContext.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/TaskSchedulingContext.java?rev=830230&r1=830229&r2=830230&view=diff
==============================================================================
--- hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/TaskSchedulingContext.java (original)
+++ hadoop/mapreduce/branches/HDFS-641/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/TaskSchedulingContext.java Tue Oct 27 15:43:58 2009
@@ -42,9 +42,6 @@
 public class TaskSchedulingContext {
 
   private TaskType type;
-  private static final String LIMIT_NORMALIZED_CAPACITY_STRING
-    = "(Capacity is restricted to max limit of %d slots.\n" +
-    "Remaining %d slots will be used by other queues.)\n";
   /**
    * the actual capacity, which depends on how many slots are available
    * in the cluster at any given time.
@@ -60,15 +57,6 @@
   private int maxCapacity = -1;
 
   /**
-   * max task limit
-   * This value is the maximum slots that can be used in a
-   * queue at any point of time. So for example assuming above config value
-   * is 100 , not more than 100 tasks would be in the queue at any point of
-   * time, assuming each task takes one slot.
-   */
-  private int maxTaskLimit = -1;
-
-  /**
    * for each user, we need to keep track of number of slots occupied by
    * running tasks
    */
@@ -95,24 +83,11 @@
   }
 
 
-  int getMaxTaskLimit() {
-    return maxTaskLimit;
-  }
-
-  void setMaxTaskLimit(int maxTaskCap) {
-    this.maxTaskLimit = maxTaskCap;
-  }
-
   /**
-   * This method checks for maxfinalLimit and
-   * sends minimum of maxTaskLimit and capacity.
-   *
+   * returns the capacity of queue as no of slots.
    * @return
    */
   int getCapacity() {
-    if ((maxTaskLimit >= 0) && (maxTaskLimit < capacity)) {
-      return maxTaskLimit;
-    }
     return capacity;
   }
 
@@ -137,15 +112,8 @@
     StringBuffer sb = new StringBuffer();
 
     sb.append("Capacity: " + getCapacity() + " slots\n");
-    //If maxTaskLimit is less than the capacity
-    if (getMaxTaskLimit() >= 0 && getMaxTaskLimit() < getCapacity()) {
-      sb.append(
-        String.format(
-          LIMIT_NORMALIZED_CAPACITY_STRING,
-          getMaxTaskLimit(), (getCapacity() - getMaxTaskLimit())));
-    }
-    if (getMaxTaskLimit() >= 0) {
-      sb.append(String.format("Maximum Slots Limit: %d\n", getMaxTaskLimit()));
+    if(getMaxCapacity() >= 0) {
+      sb.append("Maximum capacity: " + getMaxCapacity() +" slots\n");
     }
     sb.append(
       String.format(



Mime
View raw message