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 le...@apache.org on 2017/01/19 07:42:37 UTC
hadoop git commit: HDFS-11287. Storage class member storageDirs
should be private to avoid unprotected access by derived classes. (Manoj
Govindassamy via lei)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 8d6fa4569 -> 541efe18c
HDFS-11287. Storage class member storageDirs should be private to avoid unprotected access by derived classes. (Manoj Govindassamy via lei)
(cherry picked from commit 63320d1daab7ce846bb180623378efe431ad8c52)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/541efe18
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/541efe18
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/541efe18
Branch: refs/heads/branch-2
Commit: 541efe18c7328ab78ae1fa42f367e309a0effb5e
Parents: 8d6fa45
Author: Lei Xu <le...@apache.org>
Authored: Thu Jan 19 15:36:54 2017 +0800
Committer: Lei Xu <le...@apache.org>
Committed: Thu Jan 19 15:38:40 2017 +0800
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hdfs/server/common/Storage.java | 4 ++--
.../hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java | 2 +-
.../java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/541efe18/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java
index b0fe290..87ba99d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/Storage.java
@@ -123,9 +123,9 @@ public abstract class Storage extends StorageInfo {
public boolean isOfType(StorageDirType type);
}
- protected List<StorageDirectory> storageDirs =
+ private final List<StorageDirectory> storageDirs =
new CopyOnWriteArrayList<>();
-
+
private class DirIterator implements Iterator<StorageDirectory> {
final StorageDirType dirType;
final boolean includeShared;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/541efe18/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java
index a7edb4b..c6f0255 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java
@@ -296,7 +296,7 @@ public class BlockPoolSliceStorage extends Storage {
it.hasNext(); ) {
StorageDirectory sd = it.next();
if (sd.getRoot().getAbsoluteFile().equals(absPathToRemove)) {
- this.storageDirs.remove(sd);
+ getStorageDirs().remove(sd);
break;
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/541efe18/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
index c5e744f..9951ed6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
@@ -519,7 +519,7 @@ public class DataStorage extends Storage {
bpsStorage.remove(bpRoot.getAbsoluteFile());
}
- this.storageDirs.remove(sd);
+ getStorageDirs().remove(sd);
try {
sd.unlock();
} catch (IOException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org