HDFS-12380. Simplify dataQueue.wait condition logical operation in DataStreamer::run(). Contributed by liaoyuxiangqin
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/36f33a1e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/36f33a1e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/36f33a1e Branch: refs/heads/HDFS-10467 Commit: 36f33a1efb35e9f6986516499b54fdfa38fac2a1 Parents: dcd0bed Author: Mingliang Liu <[email protected]> Authored: Thu Aug 31 23:15:07 2017 -0700 Committer: Mingliang Liu <[email protected]> Committed: Thu Aug 31 23:18:48 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hdfs/DataStreamer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/36f33a1e/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java index 838da7e..4eafca1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java @@ -689,8 +689,7 @@ class DataStreamer extends Daemon { long now = Time.monotonicNow(); while ((!shouldStop() && dataQueue.size() == 0 && (stage != BlockConstructionStage.DATA_STREAMING || - stage == BlockConstructionStage.DATA_STREAMING && - now - lastPacket < halfSocketTimeout)) || doSleep ) { + now - lastPacket < halfSocketTimeout)) || doSleep) { long timeout = halfSocketTimeout - (now-lastPacket); timeout = timeout <= 0 ? 1000 : timeout; timeout = (stage == BlockConstructionStage.DATA_STREAMING)? --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
