Clone Tools
  • last updated 13 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
HADOOP-14681. Remove MockitoMaker class. Contributed by Andras Bokor.

(cherry picked from commit cca51e916b7387ea358688e8f8188ead948fbdcc)

    • -16
    • +16
    ./mapred/TestShuffleHandler.java
  1. … 5 more files in changeset.
MAPREDUCE-6850. Shuffle Handler keep-alive connections are closed from the server side. Contributed by Jonathan Eagles

  1. … 1 more file in changeset.
MAPREDUCE-6850. Shuffle Handler keep-alive connections are closed from the server side. Contributed by Jonathan Eagles

(cherry picked from commit c8bd5fc7a86f9890ceaa37a89491ab650e7e9a64)

Conflicts:

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java

  1. … 1 more file in changeset.
MAPREDUCE-6850. Shuffle Handler keep-alive connections are closed from the server side. Contributed by Jonathan Eagles

(cherry picked from commit c8bd5fc7a86f9890ceaa37a89491ab650e7e9a64)

Conflicts:

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java

  1. … 1 more file in changeset.
HADOOP-10075. Update jetty dependency to version 9 (rkanter)

    • -12
    • +13
    ./mapred/TestShuffleHandler.java
  1. … 142 more files in changeset.
MAPREDUCE-6728. Give fetchers hint when ShuffleHandler rejects a shuffling connection (haibochen via rkanter)

  1. … 5 more files in changeset.
MAPREDUCE-6728. Give fetchers hint when ShuffleHandler rejects a shuffling connection (haibochen via rkanter)

  1. … 5 more files in changeset.
MAPREDUCE-6197. Cache MapOutputLocations in ShuffleHandler. Contributed by Junping Du

(cherry picked from commit d8107fcd1c93c202925f2946d0cd4072fe0aef1e)

  1. … 1 more file in changeset.
MAPREDUCE-6197. Cache MapOutputLocations in ShuffleHandler. Contributed by Junping Du

  1. … 1 more file in changeset.
MAPREDUCE-6518. Set SO_KEEPALIVE on shuffle connections. Contributed by Chang Li

  1. … 2 more files in changeset.
MAPREDUCE-6518. Set SO_KEEPALIVE on shuffle connections. Contributed by Chang Li (cherry picked from commit ee9b80acf84718b952cbb82380cd0a4dbe22dc79)

  1. … 2 more files in changeset.
MAPREDUCE-6518. Set SO_KEEPALIVE on shuffle connections. Contributed by Chang Li (cherry picked from commit ee9b80acf84718b952cbb82380cd0a4dbe22dc79)

  1. … 2 more files in changeset.
MAPREDUCE-6474. ShuffleHandler can possibly exhaust nodemanager file descriptors. Contributed by Kuhu Shukla (cherry picked from commit 8e615588d5216394d0251a9c97bd706537856c6d)

    • -0
    • +129
    ./mapred/TestShuffleHandler.java
  1. … 2 more files in changeset.
MAPREDUCE-6474. ShuffleHandler can possibly exhaust nodemanager file descriptors. Contributed by Kuhu Shukla

    • -0
    • +129
    ./mapred/TestShuffleHandler.java
  1. … 2 more files in changeset.
MAPREDUCE-6474. ShuffleHandler can possibly exhaust nodemanager file descriptors. Contributed by Kuhu Shukla (cherry picked from commit 8e615588d5216394d0251a9c97bd706537856c6d)

    • -0
    • +129
    ./mapred/TestShuffleHandler.java
  1. … 2 more files in changeset.
MAPREDUCE-6426. TestShuffleHandler#testGetMapOutputInfo is failing. Contributed by zhihai xu.

  1. … 1 more file in changeset.
MAPREDUCE-6426. TestShuffleHandler#testGetMapOutputInfo is failing. Contributed by zhihai xu.

(cherry picked from commit fffb15bb431fcdd7ca4ce0e249f9d45f4968497b)

  1. … 1 more file in changeset.
MAPREDUCE-6426. TestShuffleHandler#testGetMapOutputInfo is failing. Contributed by zhihai xu.

(cherry picked from commit fffb15bb431fcdd7ca4ce0e249f9d45f4968497b)

  1. … 1 more file in changeset.
MAPREDUCE-6425. ShuffleHandler passes wrong "base" parameter to getMapOutputInfo if mapId is not in the cache. Contributed by zhihai xu.

(cherry picked from commit bff67dfe2f811654ffb1bbcbd87509c185f452b6)

    • -0
    • +101
    ./mapred/TestShuffleHandler.java
  1. … 2 more files in changeset.
MAPREDUCE-6425. ShuffleHandler passes wrong "base" parameter to getMapOutputInfo if mapId is not in the cache. Contributed by zhihai xu.

    • -0
    • +101
    ./mapred/TestShuffleHandler.java
  1. … 2 more files in changeset.
MAPREDUCE-6425. ShuffleHandler passes wrong "base" parameter to getMapOutputInfo if mapId is not in the cache. Contributed by zhihai xu.

(cherry picked from commit bff67dfe2f811654ffb1bbcbd87509c185f452b6)

    • -0
    • +101
    ./mapred/TestShuffleHandler.java
  1. … 2 more files in changeset.
YARN-2347. Consolidated RMStateVersion and NMDBSchemaVersion into Version in yarn-server-common. Contributed by Junping Du. svn merge --ignore-ancestry -c 1614838 ../../trunk/

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614839 13f79535-47bb-0310-9956-ffa450edef68

  1. … 21 more files in changeset.
YARN-2347. Consolidated RMStateVersion and NMDBSchemaVersion into Version in yarn-server-common. Contributed by Junping Du.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614838 13f79535-47bb-0310-9956-ffa450edef68

  1. … 21 more files in changeset.
svn merge -c 1612652 FIXES: MAPREDUCE-5963. ShuffleHandler DB schema should be versioned with compatible/incompatible changes. Contributed by Junping Du

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612654 13f79535-47bb-0310-9956-ffa450edef68

  1. … 2 more files in changeset.
MAPREDUCE-5963. ShuffleHandler DB schema should be versioned with compatible/incompatible changes. Contributed by Junping Du

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612652 13f79535-47bb-0310-9956-ffa450edef68

  1. … 2 more files in changeset.
MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594332 13f79535-47bb-0310-9956-ffa450edef68

  1. … 8 more files in changeset.
MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1594329 13f79535-47bb-0310-9956-ffa450edef68

  1. … 8 more files in changeset.
MAPREDUCE-5791. Merging change r1580996 from branch-2 to branch-2.4

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1581003 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +157
    ./mapred/TestFadvisedFileRegion.java
  1. … 4 more files in changeset.
MAPREDUCE-5791. Merging change r1580994 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580996 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +157
    ./mapred/TestFadvisedFileRegion.java
  1. … 4 more files in changeset.
MAPREDUCE-5791. Shuffle phase is slow in Windows - FadviseFileRegion::transferTo does not read disks efficiently. Contributed by Nikola Vujic.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1580994 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +157
    ./mapred/TestFadvisedFileRegion.java
  1. … 4 more files in changeset.