[HADOOP-10964] Small fix for NetworkTopologyWithNodeGroup#sortByDistance

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 2.6.0
• Fix Version/s: 2.6.0
• Target Version/s: 2.6.0
• Assignee: Yi Liu
• Reporter: Yi Liu
• Created: 13/Aug/14 06:58
• Updated: 01/Dec/14 03:10
• Resolved: 15/Aug/14 05:54

Description

nodes.length should be activeLen.

  @Override
  public void sortByDistance(Node reader, Node[] nodes, int activeLen,
      long seed, boolean randomizeBlockLocationsPerBlock) {
    // If reader is not a datanode (not in NetworkTopology tree), we need to
    // replace this reader with a sibling leaf node in tree.
    if (reader != null && !this.contains(reader)) {
      Node nodeGroup = getNode(reader.getNetworkLocation());
      if (nodeGroup != null && nodeGroup instanceof InnerNode) {
        InnerNode parentNode = (InnerNode) nodeGroup;
        // replace reader with the first children of its parent in tree
        reader = parentNode.getLeaf(0, null);
      } else {
        return;
      }
    }
    super.sortByDistance(reader, nodes, nodes.length, seed,
        randomizeBlockLocationsPerBlock);
  }