You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2016/10/31 19:42:07 UTC
[3/3] hadoop git commit: HDFS-11074. Remove unused method
FsDatasetSpi#getFinalizedBlocksOnPersistentStorage. Contributed by Hanisha
Koneru.
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/f0a6d17e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f0a6d17e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f0a6d17e
Branch: refs/heads/branch-2.8
Commit: f0a6d17e3b84094d0d06ee32000008938c35e89f
Parents: b8ae7a8
Author: Arpit Agarwal <ar...@apache.org>
Authored: Mon Oct 31 12:39:54 2016 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Mon Oct 31 12:40:03 2016 -0700
----------------------------------------------------------------------
.../server/datanode/fsdataset/FsDatasetSpi.java | 3 ---
.../datanode/fsdataset/impl/FsDatasetImpl.java | 19 -------------------
.../hdfs/server/datanode/SimulatedFSDataset.java | 5 -----
.../datanode/extdataset/ExternalDatasetImpl.java | 5 -----
4 files changed, 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f0a6d17e/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 19f580a..f7c3711 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
@@ -242,9 +242,6 @@ public interface FsDatasetSpi<V extends FsVolumeSpi> extends FSDatasetMBean {
*/
List<FinalizedReplica> getFinalizedBlocks(String bpid);
- /** @return a list of finalized blocks for the given block pool. */
- List<FinalizedReplica> 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/f0a6d17e/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 c4431f5..ce3c144 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
@@ -1864,25 +1864,6 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> {
}
/**
- * Get the list of finalized blocks from in-memory blockmap for a block pool.
- */
- @Override
- public List<FinalizedReplica>
- getFinalizedBlocksOnPersistentStorage(String bpid) {
- try(AutoCloseableLock lock = datasetLock.acquire()) {
- ArrayList<FinalizedReplica> finalized =
- new ArrayList<FinalizedReplica>(volumeMap.size(bpid));
- for (ReplicaInfo b : volumeMap.replicas(bpid)) {
- if (!b.getVolume().isTransientStorage() &&
- b.getState() == ReplicaState.FINALIZED) {
- finalized.add(new FinalizedReplica((FinalizedReplica) b));
- }
- }
- return finalized;
- }
- }
-
- /**
* Check if a block is valid.
*
* @param b The block to check.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f0a6d17e/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 d1a982f..cda7672 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
@@ -1312,11 +1312,6 @@ public class SimulatedFSDataset implements FsDatasetSpi<FsVolumeSpi> {
}
@Override
- public List<FinalizedReplica> 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/f0a6d17e/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 738f338..1bbf9de 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
@@ -93,11 +93,6 @@ public class ExternalDatasetImpl implements FsDatasetSpi<ExternalVolumeImpl> {
}
@Override
- public List<FinalizedReplica> getFinalizedBlocksOnPersistentStorage(String bpid) {
- return null;
- }
-
- @Override
public void checkAndUpdate(String bpid, long blockId, File diskFile,
File diskMetaFile, FsVolumeSpi vol) {
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org