From 353bc3799d11a7fcdfcee96016535ccd6063cbc0 Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Thu, 15 Dec 2011 21:54:00 +0000 Subject: [PATCH] HDFS-2689. HA: BookKeeperEditLogInputStream doesn't implement isInProgress(). Contributed by Aaron T. Myers git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214965 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt | 2 ++ .../contrib/bkjournal/BookKeeperEditLogInputStream.java | 6 ++++++ .../hadoop/hdfs/server/namenode/EditLogInputStream.java | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt index 3c5caae1a3..fb18eea780 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt @@ -55,3 +55,5 @@ HDFS-2671. NN should throw StandbyException in response to RPCs in STANDBY state HDFS-2680. DFSClient should construct failover proxy with exponential backoff (todd) HDFS-2683. Authority-based lookup of proxy provider fails if path becomes canonicalized (todd) + +HDFS-2689. HA: BookKeeperEditLogInputStream doesn't implement isInProgress() (atm) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperEditLogInputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperEditLogInputStream.java index 707182ec5c..636471a450 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperEditLogInputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperEditLogInputStream.java @@ -129,6 +129,12 @@ public JournalType getType() { return null; } + // TODO(HA): Test this. + @Override + public boolean isInProgress() { + return true; + } + /** * Input stream implementation which can be used by * FSEditLogOp.Reader diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EditLogInputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EditLogInputStream.java index 2c4bdd53d0..7a7f8d8743 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EditLogInputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EditLogInputStream.java @@ -86,5 +86,5 @@ public abstract class EditLogInputStream implements JournalStream, Closeable { /** * Return true if this stream is in progress, false if it is finalized. */ - abstract boolean isInProgress(); + public abstract boolean isInProgress(); }