hadoop-hdfs-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Hudson (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (HDFS-7936) Erasure coding: resolving conflicts in the branch when merging trunk changes.
Date Wed, 30 Sep 2015 15:59:37 GMT

    [ https://issues.apache.org/jira/browse/HDFS-7936?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14937217#comment-14937217
] 

Hudson commented on HDFS-7936:
------------------------------

FAILURE: Integrated in Hadoop-Hdfs-trunk #2379 (See [https://builds.apache.org/job/Hadoop-Hdfs-trunk/2379/])
HDFS-7936. Erasure coding: resolving conflicts when merging with (zhezhang: rev 11585883a9eb30ba080b9aa49dba42cb0a797d75)
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
* hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddStripedBlocks.java
* hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FileDiffList.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DecommissionManager.java
HDFS-7936. Erasure coding: resolving conflicts when merging with (zhezhang: rev 544f75d6512fefd0e36f24a35e6b7472ca7bf301)
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
HDFS-7936. Erasure coding: resolving conflicts when merging with (zhezhang: rev ea2e60fbcc79c65ec571224bd3f57c262a5d9114)
* hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddStripedBlocks.java
* hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
HDFS-7936. Erasure coding: resolving conflicts in the branch when (zhezhang: rev 97378e4cd0902fcfe4d591c92b47fc292c032438)
* hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
HDFS-7936. Erasure coding: resolving conflicts in the branch when (zhezhang: rev 578019d6a27bd3128fae1bdf7caadd8767b91e8c)
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
HDFS-7936. Erasure coding: resolving conflicts in the branch when (zhezhang: rev c243319eab89928bc06e0357a50f9422cbe54f7d)
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
HDFS-7936. Erasure coding: resolving conflicts in the branch when (zhezhang: rev 35797b08899195170715835568f96ab51bef0d98)
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
* hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStream.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java
HDFS-7936. Erasure coding: resolving conflicts in the branch when (zhezhang: rev 6bacaa9a5233cbad7f311ccd9d8f8dc9375c732d)
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfo.java
* hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestTruncateQuotaUpdate.java
* hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
* hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStripedINodeFile.java


> Erasure coding: resolving conflicts in the branch when merging trunk changes. 
> ------------------------------------------------------------------------------
>
>                 Key: HDFS-7936
>                 URL: https://issues.apache.org/jira/browse/HDFS-7936
>             Project: Hadoop HDFS
>          Issue Type: Sub-task
>            Reporter: Zhe Zhang
>            Assignee: Zhe Zhang
>             Fix For: HDFS-7285
>
>         Attachments: HDFS-7936-001.patch, HDFS-7936-002.patch, HDFS-7936-003.patch, HDFS-7936-004.patch,
HDFS-7936-005.patch
>
>
> This will be used to track and resolve conflicts when merging trunk changes. 
> Below is a list of trunk changes that have caused conflicts (updated weekly):
> # HDFS-7903
> # HDFS-7435
> # HDFS-7930
> # HDFS-7960
> # HDFS-7742
> # HDFS-8035
> # HDFS-8169
> # HDFS-8327
> # HDFS-8357



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Mime
View raw message