Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-5417. Fix storage IDs in PBHelper and UpgradeUtilities. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535791 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2013-10-25 17:21:49 +00:00
parent 1fcc24d56a
commit ec01db59ce
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt
View File

@ -47,3 +47,5 @@ IMPROVEMENTS:
(Arpit Agarwal) (Arpit Agarwal)
HDFS-5401. Fix NPE in Directory Scanner. (Arpit Agarwal) HDFS-5401. Fix NPE in Directory Scanner. (Arpit Agarwal)
HDFS-5417. Fix storage IDs in PBHelper and UpgradeUtilities. (szetszwo)

9
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
View File

@ -581,7 +581,10 @@ public class PBHelper {
builder.addStorageTypes(PBHelper.convertStorageType(storageTypes[i])); builder.addStorageTypes(PBHelper.convertStorageType(storageTypes[i]));
} }
} }
final String[] storageIDs = b.getStorageIDs();
if (storageIDs != null) {
builder.addAllStorageIDs(Arrays.asList(b.getStorageIDs())); builder.addAllStorageIDs(Arrays.asList(b.getStorageIDs()));
}
return builder.setB(PBHelper.convert(b.getBlock())) return builder.setB(PBHelper.convert(b.getBlock()))
.setBlockToken(PBHelper.convert(b.getBlockToken())) .setBlockToken(PBHelper.convert(b.getBlockToken()))
@ -609,9 +612,11 @@ public class PBHelper {
} }
} }
final int storageIDsCount = proto.getStorageIDsCount();
final String[] storageIDs = storageIDsCount == 0? null
: proto.getStorageIDsList().toArray(new String[storageIDsCount]);
LocatedBlock lb = new LocatedBlock(PBHelper.convert(proto.getB()), targets, LocatedBlock lb = new LocatedBlock(PBHelper.convert(proto.getB()), targets,
proto.getStorageIDsList().toArray(new String[proto.getStorageIDsCount()]), storageIDs, storageTypes, proto.getOffset(), proto.getCorrupt());
storageTypes, proto.getOffset(), proto.getCorrupt());
lb.setBlockToken(PBHelper.convert(proto.getBlockToken())); lb.setBlockToken(PBHelper.convert(proto.getBlockToken()));
return lb; return lb;
} }

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/UpgradeUtilities.java
View File

@ -459,6 +459,7 @@ public class UpgradeUtilities {
for (int i = 0; i < parent.length; i++) { for (int i = 0; i < parent.length; i++) {
File versionFile = new File(parent[i], "VERSION"); File versionFile = new File(parent[i], "VERSION");
StorageDirectory sd = new StorageDirectory(parent[i].getParentFile()); StorageDirectory sd = new StorageDirectory(parent[i].getParentFile());
storage.createStorageID(sd);
storage.writeProperties(versionFile, sd); storage.writeProperties(versionFile, sd);
versionFiles[i] = versionFile; versionFiles[i] = versionFile;
File bpDir = BlockPoolSliceStorage.getBpRoot(bpid, parent[i]); File bpDir = BlockPoolSliceStorage.getBpRoot(bpid, parent[i]);