From 841742cdd5717febfd58670e6f2d0ccc303a7eee Mon Sep 17 00:00:00 2001 From: Anu Engineer Date: Thu, 13 Oct 2016 15:29:52 -0700 Subject: [PATCH] Fixing merge conflicts due to HDFS-10637 --- .../container/common/impl/ContainerLocationManagerImpl.java | 2 +- .../apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 deb35f2e053..6dbd5933fd6 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()]); 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 fc3e0cf4422..b8fd696a686 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(); }