HDFS-11074. Remove unused method FsDatasetSpi#getFinalizedBlocksOnPersistentStorage. Contributed by Hanisha Koneru.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a9d68d2e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a9d68d2e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a9d68d2e Branch: refs/heads/HDFS-10285 Commit: a9d68d2e8ed8c9efc96ec7c5057a3435560311fd Parents: f646fe3 Author: Arpit Agarwal <[email protected]> Authored: Mon Oct 31 12:39:30 2016 -0700 Committer: Arpit Agarwal <[email protected]> Committed: Mon Oct 31 12:39:30 2016 -0700 ---------------------------------------------------------------------- .../server/datanode/fsdataset/FsDatasetSpi.java | 3 --- .../datanode/fsdataset/impl/FsDatasetImpl.java | 20 -------------------- .../server/datanode/SimulatedFSDataset.java | 5 ----- .../extdataset/ExternalDatasetImpl.java | 5 ----- 4 files changed, 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9d68d2e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsDatasetSpi.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsDatasetSpi.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsDatasetSpi.java index e113212..547392f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsDatasetSpi.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsDatasetSpi.java @@ -241,9 +241,6 @@ public interface FsDatasetSpi<V extends FsVolumeSpi> extends FSDatasetMBean { */ List<ReplicaInfo> getFinalizedBlocks(String bpid); - /** @return a list of finalized blocks for the given block pool. */ - List<ReplicaInfo> getFinalizedBlocksOnPersistentStorage(String bpid); - /** * Check whether the in-memory block record matches the block on the disk, * and, in case that they are not matched, update the record or mark it http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9d68d2e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java index 0f40f2a..69831f4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java @@ -1738,26 +1738,6 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> { } /** - * Get the list of finalized blocks from in-memory blockmap for a block pool. - */ - @Override - public List<ReplicaInfo> getFinalizedBlocksOnPersistentStorage( - String bpid) { - try (AutoCloseableLock lock = datasetLock.acquire()) { - ArrayList<ReplicaInfo> finalized = - new ArrayList<ReplicaInfo>(volumeMap.size(bpid)); - for (ReplicaInfo b : volumeMap.replicas(bpid)) { - if(!b.getVolume().isTransientStorage() && - b.getState() == ReplicaState.FINALIZED) { - finalized.add(new ReplicaBuilder(ReplicaState.FINALIZED) - .from(b).build()); - } - } - return finalized; - } - } - - /** * Check if a block is valid. * * @param b The block to check. http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9d68d2e/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java index 6c59231..8e6191a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java @@ -1340,11 +1340,6 @@ public class SimulatedFSDataset implements FsDatasetSpi<FsVolumeSpi> { } @Override - public List<ReplicaInfo> getFinalizedBlocksOnPersistentStorage(String bpid) { - throw new UnsupportedOperationException(); - } - - @Override public Map<String, Object> getVolumeInfoMap() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9d68d2e/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/extdataset/ExternalDatasetImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/extdataset/ExternalDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/extdataset/ExternalDatasetImpl.java index 7b7f04f..4166346 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/extdataset/ExternalDatasetImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/extdataset/ExternalDatasetImpl.java @@ -94,11 +94,6 @@ public class ExternalDatasetImpl implements FsDatasetSpi<ExternalVolumeImpl> { } @Override - public List<ReplicaInfo> getFinalizedBlocksOnPersistentStorage(String bpid) { - return null; - } - - @Override public void checkAndUpdate(String bpid, long blockId, File diskFile, File diskMetaFile, FsVolumeSpi vol) { } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
