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

Fixing merge conflicts due to HDFS-10637

This commit is contained in:
Anu Engineer 2016-10-13 15:29:52 -07:00 committed by Owen O'Malley
parent 56b0fddfbd
commit 5520f73dee
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java
View File

@ -71,7 +71,7 @@ public class ContainerLocationManagerImpl implements ContainerLocationManager {
references = this.dataset.getFsVolumeReferences();
for (int ndx = 0; ndx < references.size(); ndx++) {
FsVolumeSpi vol = references.get(ndx);
pathList.add(Paths.get(vol.getBasePath()));
pathList.add(Paths.get(vol.getBaseURI().getPath()));
}
references.close();
volumePaths = pathList.toArray(new Path[pathList.size()]);

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java
View File

@ -160,7 +160,7 @@ public class OzoneContainer {
references = dataset.getFsVolumeReferences();
for (int ndx = 0; ndx < references.size(); ndx++) {
FsVolumeSpi vol = references.get(ndx);
pathList.add(Paths.get(vol.getBasePath()));
pathList.add(Paths.get(vol.getBaseURI().getPath()));
}
references.close();
}