[
https://issues.apache.org/jira/browse/HDFS-5148?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13756926#comment-13756926
]
Arpit Agarwal commented on HDFS-5148:
-------------------------------------
Hi Plamen, thanks for offering to help!
There was concurrent work to commitBlockSynchronization in the two branches and
I filed this Jira to reconcile the conflicts.
If you can review the merge patch for the change to commitBlockSynchronization
that would be great. HDFS-2832 is adding the notion of multiple storages, so
for each target datanode the function now also takes a target storage ID.
Thanks.
> Resolve merge conflicts in commitBlockSynchronization
> -----------------------------------------------------
>
> Key: HDFS-5148
> URL: https://issues.apache.org/jira/browse/HDFS-5148
> Project: Hadoop HDFS
> Issue Type: Sub-task
> Components: namenode
> Affects Versions: Heterogeneous Storage (HDFS-2832)
> Reporter: Arpit Agarwal
> Assignee: Arpit Agarwal
> Attachments: h5148.01.patch, h5148.02.patch
>
>
> Fixes to commitBlockSynchronization in trunk (HDFS-5077) cause build failures
> when trunk is merged into HDFS-2832. Filing Jira to resolve the conflicts and
> reconcile the branches.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
