Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: core-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r663337 - in /hadoop/core/trunk: CHANGES.txt
 src/java/org/apache/hadoop/dfs/DFSck.java
 src/java/org/apache/hadoop/dfs/NamenodeFsck.java
 src/test/org/apache/hadoop/dfs/TestFsck.java
Date: Wed, 04 Jun 2008 18:27:28 -0000
To: core-commits@hadoop.apache.org
From: cdouglas@apache.org
Message-Id: <20080604182728.77DA42388A2A@eris.apache.org>

Author: cdouglas
Date: Wed Jun  4 11:27:27 2008
New Revision: 663337

URL: http://svn.apache.org/viewvc?rev=663337&view=rev
Log:
HADOOP-3452. Change fsck to return non-zero status for a corrupt
FileSystem. Contribued by lohit vijayarenu.


Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DFSck.java
    hadoop/core/trunk/src/java/org/apache/hadoop/dfs/NamenodeFsck.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=663337&r1=663336&r2=663337&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Jun  4 11:27:27 2008
@@ -78,6 +78,9 @@
     moves blocks in the tmp directory to the real block directory on a datanode-restart.
     (dhruba)
 
+    HADOOP-3452. Change fsck to return non-zero status for a corrupt
+    FileSystem. (lohit vijayarenu via cdouglas)
+
   NEW FEATURES
 
     HADOOP-3074. Provides a UrlStreamHandler for DFS and other FS,

Modified: hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DFSck.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DFSck.java?rev=663337&r1=663336&r2=663337&view=diff
==============================================================================
--- hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DFSck.java (original)
+++ hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DFSck.java Wed Jun  4 11:27:27 2008
@@ -117,14 +117,20 @@
     BufferedReader input = new BufferedReader(new InputStreamReader(
                                               stream, "UTF-8"));
     String line = null;
+    int errCode = 0;
+    // errCode returned indicating the status of Filesystem (HEALTHY/CORRUPT)
+    // depends on the format of the string. Changing the script might break
+    // fsck related testcases. For now, we scan for "is CORRUPT" as it unique.
     try {
       while ((line = input.readLine()) != null) {
         System.out.println(line);
+        if (line.contains("is CORRUPT"))
+          errCode = 1;
       }
     } finally {
       input.close();
     }
-    return 0;
+    return errCode;
   }
 
   public static void main(String[] args) throws Exception {

Modified: hadoop/core/trunk/src/java/org/apache/hadoop/dfs/NamenodeFsck.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/dfs/NamenodeFsck.java?rev=663337&r1=663336&r2=663337&view=diff
==============================================================================
--- hadoop/core/trunk/src/java/org/apache/hadoop/dfs/NamenodeFsck.java (original)
+++ hadoop/core/trunk/src/java/org/apache/hadoop/dfs/NamenodeFsck.java Wed Jun  4 11:27:27 2008
@@ -128,6 +128,9 @@
           check(files[i], res);
         }
         out.println(res);
+        // DFSck client scans for the string HEALTHY/CORRUPT to check the status
+        // of file system and return appropriate code. Changing the output string
+        // might break testcases. 
         if (res.isHealthy()) {
           out.println("\n\nThe filesystem under path '" + path + "' is HEALTHY");
         }  else {
@@ -182,7 +185,7 @@
     } else {
       out.print('.');
     }
-    if (res.totalFiles % 100 == 0) { out.flush(); }
+    if (res.totalFiles % 100 == 0) { out.println(); out.flush(); }
     int missing = 0;
     int corrupt = 0;
     long missize = 0;

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java?rev=663337&r1=663336&r2=663337&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java Wed Jun  4 11:27:27 2008
@@ -44,13 +44,17 @@
  * A JUnit test for doing fsck
  */
 public class TestFsck extends TestCase {
-  static String runFsck(Configuration conf, String... path) throws Exception {
+  static String runFsck(Configuration conf, int expectedErrCode, 
+                        boolean checkErrorCode,String... path) 
+                        throws Exception {
     PrintStream oldOut = System.out;
     ByteArrayOutputStream bStream = new ByteArrayOutputStream();
     PrintStream newOut = new PrintStream(bStream, true);
     System.setOut(newOut);
     ((Log4JLogger)PermissionChecker.LOG).getLogger().setLevel(Level.ALL);
-    assertEquals(0, ToolRunner.run(new DFSck(conf), path));
+    int errCode = ToolRunner.run(new DFSck(conf), path);
+    if (checkErrorCode)
+      assertEquals(expectedErrCode, errCode);
     ((Log4JLogger)PermissionChecker.LOG).getLogger().setLevel(Level.INFO);
     System.setOut(oldOut);
     return bStream.toString();
@@ -67,7 +71,7 @@
       fs = cluster.getFileSystem();
       util.createFiles(fs, "/srcdat");
       util.waitReplication(fs, "/srcdat", (short)3);
-      String outStr = runFsck(conf, "/");
+      String outStr = runFsck(conf, 0, true, "/");
       assertTrue(-1 != outStr.indexOf("HEALTHY"));
       System.out.println(outStr);
       if (fs != null) {try{fs.close();} catch(Exception e){}}
@@ -75,7 +79,7 @@
       
       // restart the cluster; bring up namenode but not the data nodes
       cluster = new MiniDFSCluster(conf, 0, false, null);
-      outStr = runFsck(conf, "/");
+      outStr = runFsck(conf, 1, true, "/");
       // expect the result is corrupt
       assertTrue(outStr.contains("CORRUPT"));
       System.out.println(outStr);
@@ -102,7 +106,7 @@
       fs = cluster.getFileSystem();
       util.createFiles(fs, "/srcdat");
       util.waitReplication(fs, "/srcdat", (short)3);
-      String outStr = runFsck(conf, "/non-existent");
+      String outStr = runFsck(conf, 0, true, "/non-existent");
       assertEquals(-1, outStr.indexOf("HEALTHY"));
       System.out.println(outStr);
       util.cleanup(fs, "/srcdat");
@@ -125,7 +129,7 @@
       cluster.waitActive();
       util.createFiles(fs, topDir);
       util.waitReplication(fs, topDir, (short)3);
-      String outStr = runFsck(conf, "/");
+      String outStr = runFsck(conf, 0, true, "/");
       assertTrue(outStr.contains("HEALTHY"));
       
       // Corrupt a block by deleting it
@@ -144,21 +148,21 @@
       }
 
       // We excpect the filesystem to be corrupted
-      outStr = runFsck(conf, "/");
+      outStr = runFsck(conf, 1, false, "/");
       while (!outStr.contains("CORRUPT")) {
         try {
           Thread.sleep(100);
         } catch (InterruptedException ignore) {
         }
-        outStr = runFsck(conf, "/");
+        outStr = runFsck(conf, 1, false, "/");
       } 
       
       // Fix the filesystem by moving corrupted files to lost+found
-      outStr = runFsck(conf, "/", "-move");
+      outStr = runFsck(conf, 1, true, "/", "-move");
       assertTrue(outStr.contains("CORRUPT"));
       
       // Check to make sure we have healthy filesystem
-      outStr = runFsck(conf, "/");
+      outStr = runFsck(conf, 0, true, "/");
       assertTrue(outStr.contains("HEALTHY")); 
       util.cleanup(fs, topDir);
       if (fs != null) {try{fs.close();} catch(Exception e){}}
@@ -182,7 +186,7 @@
       cluster.waitActive();
       util.createFiles(fs, topDir);
       util.waitReplication(fs, topDir, (short)3);
-      String outStr = runFsck(conf, "/");
+      String outStr = runFsck(conf, 0, true, "/");
       assertTrue(outStr.contains("HEALTHY"));
       // Open a file for writing and do not close for now
       Path openFile = new Path(topDir + "/openFile");
@@ -193,19 +197,19 @@
         writeCount++;                  
       }
       // We expect the filesystem to be HEALTHY and show one open file
-      outStr = runFsck(conf, topDir);
+      outStr = runFsck(conf, 0, true, topDir);
       System.out.println(outStr);
       assertTrue(outStr.contains("HEALTHY"));
       assertFalse(outStr.contains("OPENFORWRITE")); 
       // Use -openforwrite option to list open files
-      outStr = runFsck(conf, topDir, "-openforwrite");
+      outStr = runFsck(conf, 0, true, topDir, "-openforwrite");
       System.out.println(outStr);
       assertTrue(outStr.contains("OPENFORWRITE"));
       assertTrue(outStr.contains("openFile"));
       // Close the file
       out.close(); 
       // Now, fsck should show HEALTHY fs and should not show any open files
-      outStr = runFsck(conf, topDir);
+      outStr = runFsck(conf, 0, true, topDir);
       System.out.println(outStr);
       assertTrue(outStr.contains("HEALTHY"));
       assertFalse(outStr.contains("OPENFORWRITE"));
@@ -238,7 +242,7 @@
     String block = DFSTestUtil.getFirstBlock(fs, file1).getBlockName();
 
     // Make sure filesystem is in healthy state
-    outStr = runFsck(conf, "/");
+    outStr = runFsck(conf, 0, true, "/");
     System.out.println(outStr);
     assertTrue(outStr.contains("HEALTHY"));
     
@@ -282,7 +286,7 @@
     assertTrue (blocks.get(0).isCorrupt());
 
     // Check if fsck reports the same
-    outStr = runFsck(conf, "/");
+    outStr = runFsck(conf, 1, true, "/");
     System.out.println(outStr);
     assertTrue(outStr.contains("CORRUPT"));
     assertTrue(outStr.contains("testCorruptBlock"));