hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1527065 - in /hadoop/common/branches/branch-2: hadoop-assemblies/src/main/resources/assemblies/ hadoop-project/ hadoop-project/src/site/ hadoop-tools/ hadoop-tools/hadoop-openstack/ hadoop-tools/hadoop-sls/ hadoop-tools/hadoop-sls/dev-supp...
Date Fri, 27 Sep 2013 20:32:08 GMT
Author: tucu
Date: Fri Sep 27 20:32:06 2013
New Revision: 1527065

URL: http://svn.apache.org/r1527065
Log:
YARN-1021. Yarn Scheduler Load Simulator. (ywskycn via tucu)

Added:
    hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-sls.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-sls.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/   (props changed)
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/README
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/README
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/dev-support/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/dev-support/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/dev-support/findbugs-exclude.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/dev-support/findbugs-exclude.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/pom.xml
      - copied, changed from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/pom.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/assemblies/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/assemblies/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/assemblies/sls.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/assemblies/sls.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/bin/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/bin/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/data/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/data/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/css/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/css/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/js/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3-LICENSE
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3-LICENSE
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/showSimulationTrace.html
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/showSimulationTrace.html
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/simulate.html.template
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/simulate.html.template
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/simulate.info.html.template
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/simulate.info.html.template
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/html/track.html.template
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/html/track.html.template
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/MRAMSimulator.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/MRAMSimulator.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/SLSConfiguration.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/SLSConfiguration.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NMSimulator.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NMSimulator.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ContainerSimulator.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ContainerSimulator.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FifoSchedulerMetrics.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FifoSchedulerMetrics.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/NodeUpdateSchedulerEventWrapper.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/NodeUpdateSchedulerEventWrapper.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/SLSUtils.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/SLSUtils.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/sample-conf/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler-allocation.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler-allocation.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/sample-conf/log4j.properties
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/log4j.properties
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/sample-conf/sls-runner.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/sls-runner.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/apt/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/apt/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/apt/SchedulerLoadSimulator.apt.vm
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/apt/SchedulerLoadSimulator.apt.vm
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/css/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/css/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/css/site.css
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/css/site.css
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/sls_JVM.png
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_JVM.png
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/sls_arch.png
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_arch.png
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_memory.png
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_memory.png
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_vcores.png
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_vcores.png
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_memory.png
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_memory.png
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_vcores.png
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_vcores.png
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/sls_running_apps_containers.png
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_running_apps_containers.png
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/sls_scheduler_operation_timecost.png
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_scheduler_operation_timecost.png
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_job.png
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_job.png
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_queue.png
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_queue.png
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSRunner.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSRunner.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/TestTaskRunner.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/TestTaskRunner.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/
      - copied from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler-allocation.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler-allocation.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/simulate.html.template
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/simulate.html.template
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/simulate.info.html.template
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/simulate.info.html.template
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/sls-runner.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/sls-runner.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/track.html.template
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/track.html.template
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
      - copied unchanged from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
Modified:
    hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
    hadoop/common/branches/branch-2/hadoop-project/pom.xml
    hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-openstack/   (props changed)
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml
    hadoop/common/branches/branch-2/hadoop-tools/pom.xml

Modified: hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml?rev=1527065&r1=1527064&r2=1527065&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
Fri Sep 27 20:32:06 2013
@@ -93,6 +93,17 @@
         <include>*-sources.jar</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>../hadoop-sls/target</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+      <includes>
+        <include>*-sources.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../hadoop-sls/target/hadoop-sls-${project.version}/sls</directory>
+      <outputDirectory>/share/hadoop/${hadoop.component}/sls</outputDirectory>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>

Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1527065&r1=1527064&r2=1527065&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Fri Sep 27 20:32:06 2013
@@ -729,6 +729,16 @@
         <artifactId>hsqldb</artifactId>
         <version>2.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.codahale.metrics</groupId>
+        <artifactId>metrics-core</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-sls</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

Modified: hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml?rev=1527065&r1=1527064&r2=1527065&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml Fri Sep 27 20:32:06 2013
@@ -95,6 +95,7 @@
       <item name="Fair Scheduler" href="hadoop-yarn/hadoop-yarn-site/FairScheduler.html"/>
       <item name="Web Application Proxy" href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/>
       <item name="YARN Commands" href="hadoop-yarn/hadoop-yarn-site/YarnCommands.html"/>
+      <item name="Scheduler Load Simulator" href="hadoop-sls/SchedulerLoadSimulator.html"/>
     </menu>
 
     <menu name="YARN REST APIs" inherit="top">

Propchange: hadoop/common/branches/branch-2/hadoop-tools/hadoop-openstack/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 27 20:32:06 2013
@@ -0,0 +1 @@
+target

Propchange: hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 27 20:32:06 2013
@@ -0,0 +1 @@
+target

Copied: hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/pom.xml (from r1527059, hadoop/common/trunk/hadoop-tools/hadoop-sls/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/pom.xml?p2=hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/pom.xml&p1=hadoop/common/trunk/hadoop-tools/hadoop-sls/pom.xml&r1=1527059&r2=1527065&rev=1527065&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-sls/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-sls/pom.xml Fri Sep 27 20:32:06 2013
@@ -19,12 +19,12 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>2.3.0-SNAPSHOT</version>
     <relativePath>../../hadoop-project</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-sls</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>2.3.0-SNAPSHOT</version>
   <description>Apache Hadoop Scheduler Load Simulator</description>
   <name>Apache Hadoop Scheduler Load Simulator</name>
   <packaging>jar</packaging>

Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1527065&r1=1527064&r2=1527065&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml Fri Sep 27 20:32:06
2013
@@ -83,6 +83,11 @@
       <scope>compile</scope>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-sls</artifactId>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: hadoop/common/branches/branch-2/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/pom.xml?rev=1527065&r1=1527064&r2=1527065&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/pom.xml Fri Sep 27 20:32:06 2013
@@ -41,6 +41,7 @@
     <module>hadoop-extras</module>
     <module>hadoop-pipes</module>
     <module>hadoop-openstack</module>
+    <module>hadoop-sls</module>
   </modules>
 
   <build>



Mime
View raw message