[
https://issues.apache.org/jira/browse/HDFS-9289?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15023221#comment-15023221
]
Sangjin Lee commented on HDFS-9289:
-----------------------------------
Hi [~zhz], the only differences I see between the 2.7 commit and the 2.6 patch
are a couple of type changes (e.g. BlockInfoContiguous), right? If so, I think
it might be good to follow a cherry-pick route, rather than creating a separate
patch and commit.
If you're not familiar with it already, you can do
{noformat}
git cherry-pick -x <commit id of the commit on branch-2.7>
{noformat}
Naturally CHANGES.txt will come up as a conflict, and you can just make it like
what's proposed in the proposed patch. You'll also want to touch up the other
files just like what you did in the patch. You then stage those files that were
further modified. Finally you can finalize the cherry-pick via
{noformat}
git cherry-pick --continue
{noformat}
If you're not comfortable with that, I'd be OK with a new separate commit too
this time. Let me know if you have a question either way.
> Make DataStreamer#block thread safe and verify genStamp in commitBlock
> ----------------------------------------------------------------------
>
> Key: HDFS-9289
> URL: https://issues.apache.org/jira/browse/HDFS-9289
> Project: Hadoop HDFS
> Issue Type: Bug
> Affects Versions: 2.7.1
> Reporter: Chang Li
> Assignee: Chang Li
> Priority: Critical
> Fix For: 3.0.0, 2.7.3
>
> Attachments: HDFS-9289-branch-2.6.patch, HDFS-9289.1.patch,
> HDFS-9289.2.patch, HDFS-9289.3.patch, HDFS-9289.4.patch, HDFS-9289.5.patch,
> HDFS-9289.6.patch, HDFS-9289.7.patch, HDFS-9289.branch-2.7.patch,
> HDFS-9289.branch-2.patch
>
>
> we have seen a case of corrupt block which is caused by file complete after a
> pipelineUpdate, but the file complete with the old block genStamp. This
> caused the replicas of two datanodes in updated pipeline to be viewed as
> corrupte. Propose to check genstamp when commit block
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)