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 ey...@apache.org on 2018/06/13 01:17:42 UTC
[12/50] hadoop git commit: HDFS-13155.
BlockPlacementPolicyDefault.chooseTargetInOrder Not Checking Return Value for
NULL. Contributed by Zsolt Venczel.
HDFS-13155. BlockPlacementPolicyDefault.chooseTargetInOrder Not Checking Return Value for NULL. Contributed by Zsolt Venczel.
(cherry picked from commit bccdfeee0aaef9cb98d09ee39909b63fdcbeeafc)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/302c36ff
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/302c36ff
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/302c36ff
Branch: refs/remotes/origin/branch-3.1
Commit: 302c36ffdce4cba247f084737a539022d56d8f6d
Parents: fde4599
Author: Wei-Chiu Chuang <we...@apache.org>
Authored: Mon Jun 4 07:02:05 2018 -0700
Committer: Wei-Chiu Chuang <we...@apache.org>
Committed: Mon Jun 4 07:03:35 2018 -0700
----------------------------------------------------------------------
.../blockmanagement/BlockPlacementPolicyDefault.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/302c36ff/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
index a37cda4..25c7cfc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
@@ -480,9 +480,13 @@ public class BlockPlacementPolicyDefault extends BlockPlacementPolicy {
throws NotEnoughReplicasException {
final int numOfResults = results.size();
if (numOfResults == 0) {
- writer = chooseLocalStorage(writer, excludedNodes, blocksize,
- maxNodesPerRack, results, avoidStaleNodes, storageTypes, true)
- .getDatanodeDescriptor();
+ DatanodeStorageInfo storageInfo = chooseLocalStorage(writer,
+ excludedNodes, blocksize, maxNodesPerRack, results, avoidStaleNodes,
+ storageTypes, true);
+
+ writer = (storageInfo != null) ? storageInfo.getDatanodeDescriptor()
+ : null;
+
if (--numOfReplicas == 0) {
return writer;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org