HDFS-9555. LazyPersistFileScrubber should still sleep if there are errors in the clear progress. Contributed by Phil Yang.
(cherry picked from commit 5d4255a80156d2cacfea8184b41805070223d3a9) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3d3ed9b6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3d3ed9b6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3d3ed9b6 Branch: refs/heads/branch-2.8 Commit: 3d3ed9b68e0b389ea9a604f0e27d95b093fad66b Parents: 5df89f9 Author: Kihwal Lee <[email protected]> Authored: Fri Apr 22 11:10:36 2016 -0500 Committer: Kihwal Lee <[email protected]> Committed: Fri Apr 22 11:10:36 2016 -0500 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d3ed9b6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 7cad727..e36f454 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -3896,14 +3896,17 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, .debug("Namenode is in safemode, skipping scrubbing of corrupted lazy-persist files."); } } + } catch (Exception e) { + FSNamesystem.LOG.error( + "Ignoring exception in LazyPersistFileScrubber:", e); + } + + try { Thread.sleep(scrubIntervalSec * 1000); } catch (InterruptedException e) { FSNamesystem.LOG.info( "LazyPersistFileScrubber was interrupted, exiting"); break; - } catch (Exception e) { - FSNamesystem.LOG.error( - "Ignoring exception in LazyPersistFileScrubber:", e); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
