Uploaded image for project: 'Hadoop HDFS'
  1. Hadoop HDFS
  2. HDFS-12531

Fix conflict in the javadoc of UnderReplicatedBlocks.java in branch-2

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Resolved
    • Minor
    • Resolution: Fixed
    • 2.8.0
    • 2.9.0, 2.8.3
    • documentation
    • Reviewed

    Description

      In HDFS-9205, the following was pushed without fixing conflicts.

       * <p/>
 * The policy for choosing which priority to give added blocks
<<<<<<< HEAD
 * is implemented in {@link #getPriority(int, int, int)}.
=======
 * is implemented in {@link #getPriority(BlockInfo, int, int, int, int)}.
>>>>>>> 5411dc5... HDFS-9205. Do not schedule corrupt blocks for replication.  (szetszwo)
 * </p>

      Attachments

        1. HDFS-12531-branch-2.01.patch
          1.0 kB
          Bharat Viswanadham

        Issue Links

          is broken by

          Improvement - An improvement or enhancement to an existing feature or task. HDFS-9205 Do not schedule corrupt blocks for replication

          • Minor - Minor loss of function, or other problem where easy workaround is present.
          • Resolved

          Activity

            People

              bharat Bharat Viswanadham
              aajisaka Akira Ajisaka
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: