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 zh...@apache.org on 2015/01/26 18:44:50 UTC
[35/50] [abbrv] hadoop git commit: HDFS-7660. BlockReceiver#close()
might be called multiple times,
which causes the fsvolume reference being released incorrectly. (Lei Xu via
yliu)
HDFS-7660. BlockReceiver#close() might be called multiple times, which causes the fsvolume reference being released incorrectly. (Lei Xu via yliu)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8a96c6de
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8a96c6de
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8a96c6de
Branch: refs/heads/HDFS-EC
Commit: 8a96c6dee1a68969d31799a30d6f48894a4d13c1
Parents: c265a0e
Author: yliu <yl...@apache.org>
Authored: Fri Jan 23 02:37:44 2015 +0800
Committer: Zhe Zhang <zh...@apache.org>
Committed: Mon Jan 26 09:43:29 2015 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++++
.../org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8a96c6de/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 74eb160..9176ec7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -768,6 +768,10 @@ Release 2.7.0 - UNRELEASED
HDFS-3519. Checkpoint upload may interfere with a concurrent saveNamespace.
(Ming Ma via cnauroth)
+ HDFS-7660. BlockReceiver#close() might be called multiple times, which
+ causes the fsvolume reference being released incorrectly. (Lei Xu via
+ yliu)
+
Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8a96c6de/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
index 12041a6..3d37df5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
@@ -123,7 +123,7 @@ class BlockReceiver implements Closeable {
private boolean syncOnClose;
private long restartBudget;
/** the reference of the volume where the block receiver writes to */
- private final ReplicaHandler replicaHandler;
+ private ReplicaHandler replicaHandler;
/**
* for replaceBlock response
@@ -334,6 +334,7 @@ class BlockReceiver implements Closeable {
}
if (replicaHandler != null) {
IOUtils.cleanup(null, replicaHandler);
+ replicaHandler = null;
}
if (measuredFlushTime) {
datanode.metrics.addFlushNanos(flushTotalNanos);