Fixing merge conflicts due to HDFS-10637
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/841742cd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/841742cd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/841742cd Branch: refs/heads/HDFS-7240 Commit: 841742cdd5717febfd58670e6f2d0ccc303a7eee Parents: 7d70e57 Author: Anu Engineer <aengin...@apache.org> Authored: Thu Oct 13 15:29:52 2016 -0700 Committer: Anu Engineer <aengin...@apache.org> Committed: Thu Oct 13 15:29:52 2016 -0700 ---------------------------------------------------------------------- .../ozone/container/common/impl/ContainerLocationManagerImpl.java | 2 +- .../apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/841742cd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java index deb35f2..6dbd593 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java @@ -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()]); http://git-wip-us.apache.org/repos/asf/hadoop/blob/841742cd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java index fc3e0cf..b8fd696 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java @@ -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(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
