[ https://issues.apache.org/jira/browse/HDFS-5794?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Jing Zhao updated HDFS-5794: ---------------------------- Resolution: Fixed Fix Version/s: 3.0.0 Hadoop Flags: Reviewed Status: Resolved (was: Patch Available) I've committed this. The change is only needed in trunk. Layout version changes in branch-2 will later be covered by merging HDFS-5777. > Fix the inconsistency of layout version number of > ADD_DATANODE_AND_STORAGE_UUIDS between trunk and branch-2 > ----------------------------------------------------------------------------------------------------------- > > Key: HDFS-5794 > URL: https://issues.apache.org/jira/browse/HDFS-5794 > Project: Hadoop HDFS > Issue Type: Bug > Components: namenode > Affects Versions: 3.0.0, 2.4.0 > Reporter: Jing Zhao > Assignee: Jing Zhao > Priority: Minor > Fix For: 3.0.0 > > Attachments: HDFS-5794.000.patch, HDFS-5794.001.patch > > > Currently in trunk, we have the layout version: > {code} > EDITLOG_ADD_BLOCK(-48, ...), > CACHING(-49, ...), > ADD_DATANODE_AND_STORAGE_UUIDS(-50, ...); > {code} > And in branch-2, we have: > {code} > EDITLOG_SUPPORT_RETRYCACHE(-47, ...), > ADD_DATANODE_AND_STORAGE_UUIDS(-49, -47, ...); > {code} > We plan to backport HDFS-5704 and HDFS-5777 to branch-2, thus > EDITLOG_ADD_BLOCK will also take -48 in branch-2. However, we cannot change > ADD_DATANODE_AND_STORAGE_UUIDS to -50 in branch-2. Otherwise fsimages written > by trunk and branch-2 have the same layout -50 but branch-2 cannot read the > -50 fsimage if it is written by trunk. -- This message was sent by Atlassian JIRA (v6.1.5#6160)