From 6e5692e7e221a22a86257ba5f85746102528e96d Mon Sep 17 00:00:00 2001 From: Mingliang Liu Date: Fri, 11 Jun 2021 00:34:24 -0700 Subject: [PATCH] Revert "HDFS-16033 Fix issue of the StatisticsDataReferenceCleaner cleanUp (#3042)" This reverts commit 4a26a61ecd54bd36b6d089f999359da5fca16723. --- .../src/main/java/org/apache/hadoop/fs/FileSystem.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java index 057382bed9..c6cf941cee 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java @@ -4004,19 +4004,12 @@ public void cleanUp() { * Background action to act on references being removed. */ private static class StatisticsDataReferenceCleaner implements Runnable { - /** - * Represents the timeout period expires for remove reference objects from - * the STATS_DATA_REF_QUEUE when the queue is empty. - */ - private static final int REF_QUEUE_POLL_TIMEOUT = 10000; - @Override public void run() { while (!Thread.interrupted()) { try { StatisticsDataReference ref = - (StatisticsDataReference)STATS_DATA_REF_QUEUE. - remove(REF_QUEUE_POLL_TIMEOUT); + (StatisticsDataReference)STATS_DATA_REF_QUEUE.remove(); ref.cleanUp(); } catch (InterruptedException ie) { LOGGER.warn("Cleaner thread interrupted, will stop", ie);