hadoop: use standard log4j logging facility

Replace ceph.debug(msg, level) with LOG.level(msg)
provided by the log4j facility used by Hadoop. The
level can now be provided on a class-by-class basis
by modifying conf/log4j.properties.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/src/client/hadoop/ceph/CephFS.java b/src/client/hadoop/ceph/CephFS.java
index fd294c765fa2bb64c42c85bd78c97fcce86d8aa1..cf39b5aa15b7227869f988654ec84d12f66f5130 100644 (file)
--- a/src/client/hadoop/ceph/CephFS.java
+++ b/src/client/hadoop/ceph/CephFS.java
@@ -22,33 +22,14 @@
  */
 package org.apache.hadoop.fs.ceph;
 
-
 import org.apache.hadoop.conf.Configuration;
-import org.apache.commons.logging.Log;
-
 
 abstract class CephFS {
 
-  protected static final int FATAL = 0;
-  protected static final int ERROR = 1;
-  protected static final int WARN = 2;
-  protected static final int INFO = 3;
-  protected static final int DEBUG = 4;
-  protected static final int TRACE = 5;
-  protected static final int NOLOG = 6;
-
   protected static final int ENOTDIR = 20;
   protected static final int EEXIST = 17;
   protected static final int ENOENT = 2;
 
-  private boolean debug = false;
-  private Log LOG;
-
-  public CephFS(Configuration conf, Log log) {
-    debug = ("true".equals(conf.get("fs.ceph.debug", "false")));
-    LOG = log;
-  }
-
   /*
    * Performs any necessary setup to allow general use of the filesystem.
    * Inputs:
@@ -266,41 +247,4 @@ abstract class CephFS {
    * Returns: the new position (as a long) of the filehandle on success,
    *  or a negative error code on failure.      */
   abstract protected long ceph_seek_from_start(int fh, long pos);
-    
-  protected void debug(String statement, int priority) {
-    if (debug) {
-      System.err.println(statement);
-    }
-    switch (priority) {
-    case FATAL:
-      LOG.fatal(statement);
-      break;
-
-    case ERROR:
-      LOG.error(statement);
-      break;
-
-    case WARN:
-      LOG.warn(statement);
-      break;
-
-    case INFO:
-      LOG.info(statement);
-      break;
-
-    case DEBUG:
-      LOG.debug(statement);
-      break;
-
-    case TRACE:
-      LOG.trace(statement);
-      break;
-
-    case NOLOG:
-      break;
-
-    default:
-      break;
-    }
-  }
 }

diff --git a/src/client/hadoop/ceph/CephFaker.java b/src/client/hadoop/ceph/CephFaker.java
index 00364b732768051a355ed1953790cd345a3989ad..71ad206a09f8136445f18ea9d7154967139cc2da 100644 (file)
--- a/src/client/hadoop/ceph/CephFaker.java
+++ b/src/client/hadoop/ceph/CephFaker.java
@@ -29,6 +29,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 
 import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FileStatus;
@@ -40,7 +41,7 @@ import org.apache.hadoop.fs.permission.FsPermission;
 
 
 class CephFaker extends CephFS {
-       
+  private static final Log LOG = LogFactory.getLog(CephFaker.class);
   FileSystem localFS;
   String localPrefix;
   int blockSize;
@@ -51,7 +52,6 @@ class CephFaker extends CephFS {
   boolean initialized = false;
        
   public CephFaker(Configuration con, Log log) {
-    super(con, log);
     conf = con;
     files = new Hashtable<Integer, Object>();
     filenames = new Hashtable<Integer, String>();
@@ -254,7 +254,7 @@ class CephFaker extends CephFS {
       stream = localFS.open(new Path(path));
       files.put(new Integer(fileCount), stream);
       filenames.put(new Integer(fileCount), path);
-      debug("ceph_open_for_read fh:" + fileCount + ", pathname:" + path, INFO);
+      LOG.info("ceph_open_for_read fh:" + fileCount + ", pathname:" + path);
       return fileCount++;
     } catch (IOException e) {}
     return -1; // failure
@@ -268,15 +268,14 @@ class CephFaker extends CephFS {
       stream = localFS.create(new Path(path));
       files.put(new Integer(fileCount), stream);
       filenames.put(new Integer(fileCount), path);
-      debug("ceph_open_for_overwrite fh:" + fileCount + ", pathname:" + path,
-          INFO);
+      LOG.info("ceph_open_for_overwrite fh:" + fileCount + ", pathname:" + path);
       return fileCount++;
     } catch (IOException e) {}
     return -1; // failure
   }
 
   protected int ceph_close(int filehandle) {
-    debug("ceph_close(filehandle " + filehandle + ")", INFO);
+    LOG.info("ceph_close(filehandle " + filehandle + ")");
     try {
       ((Closeable) files.get(new Integer(filehandle))).close();
       if (null == files.get(new Integer(filehandle))) {
@@ -285,10 +284,10 @@ class CephFaker extends CephFS {
       }
       return 0; // hurray, success
     } catch (NullPointerException ne) {
-      debug("ceph_close caught NullPointerException!" + ne, WARN);
+      LOG.warn("ceph_close caught NullPointerException!" + ne);
     } // err, how?
     catch (IOException ie) {
-      debug("ceph_close caught IOException!" + ie, WARN);
+      LOG.warn("ceph_close caught IOException!" + ie);
     }
     return -1; // failure
   }
@@ -391,24 +390,23 @@ class CephFaker extends CephFS {
 
   protected int ceph_write(int fh, byte[] buffer,
       int buffer_offset, int length) {
-    debug(
+    LOG.info(
         "ceph_write fh:" + fh + ", buffer_offset:" + buffer_offset + ", length:"
-        + length,
-        INFO);
+        + length);
     long ret = -1; // generic fail
 
     try {
       FSDataOutputStream os = (FSDataOutputStream) files.get(new Integer(fh));
 
-      debug("ceph_write got outputstream", INFO);
+      LOG.info("ceph_write got outputstream");
       long startPos = os.getPos();
 
       os.write(buffer, buffer_offset, length);
       ret = os.getPos() - startPos;
     } catch (IOException e) {
-      debug("ceph_write caught IOException!", WARN);
+      LOG.warn("ceph_write caught IOException!");
     } catch (NullPointerException f) {
-      debug("ceph_write caught NullPointerException!", WARN);
+      LOG.warn("ceph_write caught NullPointerException!");
     }
     return (int) ret;
   }
@@ -428,24 +426,23 @@ class CephFaker extends CephFS {
   }
 
   protected long ceph_seek_from_start(int fh, long pos) {
-    debug("ceph_seek_from_start(fh " + fh + ", pos " + pos + ")", INFO);
+    LOG.info("ceph_seek_from_start(fh " + fh + ", pos " + pos + ")");
     long ret = -1; // generic fail
 
     try {
-      debug("ceph_seek_from_start filename is " + filenames.get(new Integer(fh)),
-          INFO);
+      LOG.info("ceph_seek_from_start filename is " + filenames.get(new Integer(fh)));
       if (null == files.get(new Integer(fh))) {
-        debug("ceph_seek_from_start: is is null!", WARN);
+        LOG.warn("ceph_seek_from_start: is is null!");
       }
       FSDataInputStream is = (FSDataInputStream) files.get(new Integer(fh));
 
-      debug("ceph_seek_from_start retrieved is!", INFO);
+      LOG.info("ceph_seek_from_start retrieved is!");
       is.seek(pos);
       ret = is.getPos();
     } catch (IOException e) {
-      debug("ceph_seek_from_start caught IOException!", WARN);
+      LOG.warn("ceph_seek_from_start caught IOException!");
     } catch (NullPointerException f) {
-      debug("ceph_seek_from_start caught NullPointerException!", WARN);
+      LOG.warn("ceph_seek_from_start caught NullPointerException!");
     }
     return (int) ret;
   }

diff --git a/src/client/hadoop/ceph/CephFileSystem.java b/src/client/hadoop/ceph/CephFileSystem.java
index a7317b127431690fc6b64db700437e7e94c2f7e2..431bad6e73c090102239c9d7d290bfeb2cdffb50 100644 (file)
--- a/src/client/hadoop/ceph/CephFileSystem.java
+++ b/src/client/hadoop/ceph/CephFileSystem.java
@@ -28,6 +28,8 @@ import java.net.URI;
 import java.util.EnumSet;
 import java.lang.Math;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FSDataInputStream;
@@ -63,7 +65,7 @@ import org.apache.hadoop.fs.FileStatus;
  * from the respective Ceph system of at least that importance.
  */
 public class CephFileSystem extends FileSystem {
-
+  private static final Log LOG = LogFactory.getLog(CephFileSystem.class);
   private URI uri;
 
   private final Path root;
@@ -100,7 +102,7 @@ public class CephFileSystem extends FileSystem {
     if (!initialized) {
       return null;
     }
-    ceph.debug("getUri:exit with return " + uri, ceph.DEBUG);
+    LOG.debug("getUri:exit with return " + uri);
     return uri;
   }
 
@@ -147,25 +149,23 @@ public class CephFileSystem extends FileSystem {
     arguments += " --client-readahead-max-periods="
         + conf.get("fs.ceph.readahead", "1");
     // make sure they gave us a ceph monitor address or conf file
-    ceph.debug("initialize:Ceph initialization arguments: " + arguments,
-        ceph.INFO);
+    LOG.info("initialize:Ceph initialization arguments: " + arguments);
     if ((conf.get("fs.ceph.monAddr") == null) && (arguments.indexOf("-m") == -1)
         && (arguments.indexOf("-c") == -1)) {
-      ceph.debug("initialize:You need to specify a Ceph monitor address.",
-          ceph.FATAL);
+      LOG.fatal("initialize:You need to specify a Ceph monitor address.");
       throw new IOException(
           "You must specify a Ceph monitor address or config file!");
     }
     // Initialize the client
     if (!ceph.ceph_initializeClient(arguments,
         conf.getInt("fs.ceph.blockSize", 1 << 26))) {
-      ceph.debug("initialize:Ceph initialization failed!", ceph.FATAL);
+      LOG.fatal("initialize:Ceph initialization failed!");
       throw new IOException("Ceph initialization failed!");
     }
     initialized = true;
-    ceph.debug("initialize:Ceph initialized client. Setting cwd to /", ceph.INFO);
+    LOG.info("initialize:Ceph initialized client. Setting cwd to /");
     ceph.ceph_setcwd("/");
-    ceph.debug("initialize:exit", ceph.DEBUG);
+    LOG.debug("initialize:exit");
   }
 
   /**
@@ -180,11 +180,11 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("close:enter", ceph.DEBUG);
+    LOG.debug("close:enter");
     super.close(); // this method does stuff, make sure it's run!
-    ceph.debug("close: Calling ceph_kill_client from Java", ceph.TRACE);
+    LOG.trace("close: Calling ceph_kill_client from Java");
     ceph.ceph_kill_client();
-    ceph.debug("close:exit", ceph.DEBUG);
+    LOG.debug("close:exit");
   }
 
   /**
@@ -203,17 +203,16 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("append:enter with path " + file + " bufferSize " + bufferSize,
-        ceph.DEBUG);
+    LOG.debug("append:enter with path " + file + " bufferSize " + bufferSize);
     Path abs_path = makeAbsolute(file);
 
     if (progress != null) {
       progress.progress();
     }
-    ceph.debug("append: Entering ceph_open_for_append from Java", ceph.TRACE);
+    LOG.trace("append: Entering ceph_open_for_append from Java");
     int fd = ceph.ceph_open_for_append(abs_path.toString());
 
-    ceph.debug("append: Returned to Java", ceph.TRACE);
+    LOG.trace("append: Returned to Java");
     if (progress != null) {
       progress.progress();
     }
@@ -225,7 +224,7 @@ public class CephFileSystem extends FileSystem {
     CephOutputStream cephOStream = new CephOutputStream(getConf(), ceph, fd,
         bufferSize);
 
-    ceph.debug("append:exit", ceph.DEBUG);
+    LOG.debug("append:exit");
     return new FSDataOutputStream(cephOStream, statistics);
   }
 
@@ -237,10 +236,10 @@ public class CephFileSystem extends FileSystem {
     if (!initialized) {
       return null;
     }
-    ceph.debug("getWorkingDirectory:enter", ceph.DEBUG);
+    LOG.debug("getWorkingDirectory:enter");
     String cwd = ceph.ceph_getcwd();
 
-    ceph.debug("getWorkingDirectory:exit with path " + cwd, ceph.DEBUG);
+    LOG.debug("getWorkingDirectory:exit with path " + cwd);
     return new Path(fs_default_name + ceph.ceph_getcwd());
   }
 
@@ -256,17 +255,16 @@ public class CephFileSystem extends FileSystem {
     if (!initialized) {
       return;
     }
-    ceph.debug("setWorkingDirecty:enter with new working dir " + dir, ceph.DEBUG);
+    LOG.debug("setWorkingDirecty:enter with new working dir " + dir);
     Path abs_path = makeAbsolute(dir);
 
-    ceph.debug("setWorkingDirectory:calling ceph_setcwd from Java", ceph.TRACE);
+    LOG.trace("setWorkingDirectory:calling ceph_setcwd from Java");
     if (!ceph.ceph_setcwd(abs_path.toString())) {
-      ceph.debug(
+      LOG.warn(
           "setWorkingDirectory: WARNING! ceph_setcwd failed for some reason on path "
-              + abs_path,
-              ceph.WARN);
+              + abs_path);
     }
-    ceph.debug("setWorkingDirectory:exit", ceph.DEBUG);
+    LOG.debug("setWorkingDirectory:exit");
   }
 
   /**
@@ -283,20 +281,19 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("exists:enter with path " + path, ceph.DEBUG);
+    LOG.debug("exists:enter with path " + path);
     boolean result;
     Path abs_path = makeAbsolute(path);
 
     if (abs_path.equals(root)) {
       result = true;
     } else {
-      ceph.debug(
-          "exists:Calling ceph_exists from Java on path " + abs_path.toString(),
-          ceph.TRACE);
+      LOG.trace(
+          "exists:Calling ceph_exists from Java on path " + abs_path.toString());
       result = ceph.ceph_exists(abs_path.toString());
-      ceph.debug("exists:Returned from ceph_exists to Java", ceph.TRACE);
+      LOG.trace("exists:Returned from ceph_exists to Java");
     }
-    ceph.debug("exists:exit with value " + result, ceph.DEBUG);
+    LOG.debug("exists:exit with value " + result);
     return result;
   }
 
@@ -316,22 +313,21 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("mkdirs:enter with path " + path, ceph.DEBUG);
+    LOG.debug("mkdirs:enter with path " + path);
     Path abs_path = makeAbsolute(path);
 
-    ceph.debug("mkdirs:calling ceph_mkdirs from Java", ceph.TRACE);
+    LOG.trace("mkdirs:calling ceph_mkdirs from Java");
     int result = ceph.ceph_mkdirs(abs_path.toString(), (int) perms.toShort());
 
     if (result != 0) {
-      ceph.debug(
-          "mkdirs: make directory " + abs_path + "Failing with result " + result,
-          ceph.WARN);
+      LOG.warn(
+          "mkdirs: make directory " + abs_path + "Failing with result " + result);
       if (ceph.ENOTDIR == result) {
         throw new IOException("Parent path is not a directory");
       }
       return false;
     } else {
-      ceph.debug("mkdirs:exiting succesfully", ceph.DEBUG);
+      LOG.debug("mkdirs:exiting succesfully");
       return true;
     }
   }
@@ -350,17 +346,17 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("isFile:enter with path " + path, ceph.DEBUG);
+    LOG.debug("isFile:enter with path " + path);
     Path abs_path = makeAbsolute(path);
     boolean result;
 
     if (abs_path.equals(root)) {
       result = false;
     } else {
-      ceph.debug("isFile:entering ceph_isfile from Java", ceph.TRACE);
+      LOG.trace("isFile:entering ceph_isfile from Java");
       result = ceph.ceph_isfile(abs_path.toString());
     }
-    ceph.debug("isFile:exit with result " + result, ceph.DEBUG);
+    LOG.debug("isFile:exit with result " + result);
     return result;
   }
 
@@ -378,18 +374,18 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("isDirectory:enter with path " + path, ceph.DEBUG);
+    LOG.debug("isDirectory:enter with path " + path);
     Path abs_path = makeAbsolute(path);
     boolean result;
 
     if (abs_path.equals(root)) {
       result = true;
     } else {
-      ceph.debug("calling ceph_isdirectory from Java", ceph.TRACE);
+      LOG.trace("calling ceph_isdirectory from Java");
       result = ceph.ceph_isdirectory(abs_path.toString());
-      ceph.debug("Returned from ceph_isdirectory to Java", ceph.TRACE);
+      LOG.trace("Returned from ceph_isdirectory to Java");
     }
-    ceph.debug("isDirectory:exit with result " + result, ceph.DEBUG);
+    LOG.debug("isDirectory:exit with result " + result);
     return result;
   }
 
@@ -407,14 +403,14 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("getFileStatus:enter with path " + path, ceph.DEBUG);
+    LOG.debug("getFileStatus:enter with path " + path);
     Path abs_path = makeAbsolute(path);
     // sadly, Ceph doesn't really do uids/gids just yet, but
     // everything else is filled
     FileStatus status;
     Stat lstat = new Stat();
 
-    ceph.debug("getFileStatus: calling ceph_stat from Java", ceph.TRACE);
+    LOG.trace("getFileStatus: calling ceph_stat from Java");
     if (ceph.ceph_stat(abs_path.toString(), lstat)) {
       status = new FileStatus(lstat.size, lstat.is_dir,
           ceph.ceph_replication(abs_path.toString()), lstat.block_size,
@@ -427,7 +423,7 @@ public class CephFileSystem extends FileSystem {
           + " does not exist or could not be accessed");
     }
 
-    ceph.debug("getFileStatus:exit", ceph.DEBUG);
+    LOG.debug("getFileStatus:exit");
     return status;
   }
 
@@ -444,7 +440,7 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("listStatus:enter with path " + path, ceph.WARN);
+    LOG.warn("listStatus:enter with path " + path);
     Path abs_path = makeAbsolute(path);
     Path[] paths = listPaths(abs_path);
 
@@ -454,7 +450,7 @@ public class CephFileSystem extends FileSystem {
       for (int i = 0; i < paths.length; ++i) {
         statuses[i] = getFileStatus(paths[i]);
       }
-      ceph.debug("listStatus:exit", ceph.DEBUG);
+      LOG.debug("listStatus:exit");
       return statuses;
     }
 
@@ -472,14 +468,13 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug(
-        "setPermission:enter with path " + p + " and permissions " + permission,
-        ceph.DEBUG);
+    LOG.debug(
+        "setPermission:enter with path " + p + " and permissions " + permission);
     Path abs_path = makeAbsolute(p);
 
-    ceph.debug("setPermission:calling ceph_setpermission from Java", ceph.TRACE);
+    LOG.trace("setPermission:calling ceph_setpermission from Java");
     ceph.ceph_setPermission(abs_path.toString(), permission.toShort());
-    ceph.debug("setPermission:exit", ceph.DEBUG);
+    LOG.debug("setPermission:exit");
   }
 
   /**
@@ -495,12 +490,11 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug(
-        "setTimes:enter with path " + p + " mtime:" + mtime + " atime:" + atime,
-        ceph.DEBUG);
+    LOG.debug(
+        "setTimes:enter with path " + p + " mtime:" + mtime + " atime:" + atime);
     Path abs_path = makeAbsolute(p);
 
-    ceph.debug("setTimes:calling ceph_setTimes from Java", ceph.TRACE);
+    LOG.trace("setTimes:calling ceph_setTimes from Java");
     int r = ceph.ceph_setTimes(abs_path.toString(), mtime, atime);
 
     if (r < 0) {
@@ -508,7 +502,7 @@ public class CephFileSystem extends FileSystem {
           "Failed to set times on path " + abs_path.toString() + " Error code: "
           + r);
     }
-    ceph.debug("setTimes:exit", ceph.DEBUG);
+    LOG.debug("setTimes:exit");
   }
 
   /**
@@ -542,7 +536,7 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("create:enter with path " + path, ceph.DEBUG);
+    LOG.debug("create:enter with path " + path);
     Path abs_path = makeAbsolute(path);
 
     if (progress != null) {
@@ -589,15 +583,14 @@ public class CephFileSystem extends FileSystem {
       }
     }
     // Step 3: open the file
-    ceph.debug("calling ceph_open_for_overwrite from Java", ceph.TRACE);
+    LOG.trace("calling ceph_open_for_overwrite from Java");
     int fh = ceph.ceph_open_for_overwrite(abs_path.toString(),
         (int) permission.toShort());
 
     if (progress != null) {
       progress.progress();
     }
-    ceph.debug("Returned from ceph_open_for_overwrite to Java with fh " + fh,
-        ceph.TRACE);
+    LOG.trace("Returned from ceph_open_for_overwrite to Java with fh " + fh);
     if (fh < 0) {
       throw new IOException(
           "create: Open for overwrite failed on path \"" + path.toString()
@@ -608,7 +601,7 @@ public class CephFileSystem extends FileSystem {
     OutputStream cephOStream = new CephOutputStream(getConf(), ceph, fh,
         bufferSize);
 
-    ceph.debug("create:exit", ceph.DEBUG);
+    LOG.debug("create:exit");
     return new FSDataOutputStream(cephOStream, statistics);
   }
 
@@ -627,7 +620,7 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("open:enter with path " + path, ceph.DEBUG);
+    LOG.debug("open:enter with path " + path);
     Path abs_path = makeAbsolute(path);
 
     int fh = ceph.ceph_open_for_read(abs_path.toString());
@@ -650,9 +643,9 @@ public class CephFileSystem extends FileSystem {
     }
     Stat lstat = new Stat();
 
-    ceph.debug("open:calling ceph_stat from Java", ceph.TRACE);
+    LOG.trace("open:calling ceph_stat from Java");
     ceph.ceph_stat(abs_path.toString(), lstat);
-    ceph.debug("open:returned to Java", ceph.TRACE);
+    LOG.trace("open:returned to Java");
     long size = lstat.size;
 
     if (size < 0) {
@@ -663,7 +656,7 @@ public class CephFileSystem extends FileSystem {
     FSInputStream cephIStream = new CephInputStream(getConf(), ceph, fh, size,
         bufferSize);
 
-    ceph.debug("open:exit", ceph.DEBUG);
+    LOG.debug("open:exit");
     return new FSDataInputStream(cephIStream);
   }
 
@@ -681,26 +674,25 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("rename:enter with src:" + src + " and dest:" + dst, ceph.DEBUG);
+    LOG.debug("rename:enter with src:" + src + " and dest:" + dst);
     Path abs_src = makeAbsolute(src);
     Path abs_dst = makeAbsolute(dst);
 
-    ceph.debug("calling ceph_rename from Java", ceph.TRACE);
+    LOG.trace("calling ceph_rename from Java");
     boolean result = ceph.ceph_rename(abs_src.toString(), abs_dst.toString());
 
     if (!result) {
       if (isDirectory(abs_dst)) { // move the srcdir into destdir
-        ceph.debug("ceph_rename failed but dst is a directory!", ceph.NOLOG);
+        LOG.debug("ceph_rename failed but dst is a directory!");
         Path new_dst = new Path(abs_dst, abs_src.getName());
 
         result = rename(abs_src, new_dst);
-        ceph.debug(
+        LOG.debug(
             "attempt to move " + abs_src.toString() + " to "
-            + new_dst.toString() + "has result:" + result,
-            ceph.NOLOG);
+            + new_dst.toString() + "has result:" + result);
       }
     }
-    ceph.debug("rename:exit with result: " + result, ceph.DEBUG);
+    LOG.debug("rename:exit with result: " + result);
     return result;
   }
 
@@ -725,61 +717,52 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug(
+    LOG.debug(
         "getFileBlockLocations:enter with path " + file.getPath()
-        + ", start pos " + start + ", length " + len,
-        ceph.DEBUG);
+        + ", start pos " + start + ", length " + len);
     // sanitize and get the filehandle
     Path abs_path = makeAbsolute(file.getPath());
 
-    ceph.debug("getFileBlockLocations:call ceph_open_for_read from Java",
-        ceph.TRACE);
+    LOG.trace("getFileBlockLocations:call ceph_open_for_read from Java");
     int fh = ceph.ceph_open_for_read(abs_path.toString());
 
-    ceph.debug(
+    LOG.trace(
         "getFileBlockLocations:return from ceph_open_for_read to Java with fh "
-            + fh,
-            ceph.TRACE);
+            + fh);
     if (fh < 0) {
-      ceph.debug(
+      LOG.error(
           "getFileBlockLocations:got error " + fh
-          + ", exiting and returning null!",
-          ceph.ERROR);
+          + ", exiting and returning null!");
       return null;
     }
     // get the block size
-    ceph.debug("getFileBlockLocations:call ceph_getblocksize from Java",
-        ceph.TRACE);
+    LOG.trace("getFileBlockLocations:call ceph_getblocksize from Java");
     long blockSize = ceph.ceph_getblocksize(abs_path.toString());
 
-    ceph.debug("getFileBlockLocations:return from ceph_getblocksize", ceph.TRACE);
+    LOG.trace("getFileBlockLocations:return from ceph_getblocksize");
     BlockLocation[] locations = new BlockLocation[(int) Math.ceil(len / (float) blockSize)];
     long offset;
 
     for (int i = 0; i < locations.length; ++i) {
       offset = start + i * blockSize;
-      ceph.debug(
+      LOG.trace(
           "getFileBlockLocations:call ceph_hosts from Java on fh " + fh
-          + " and offset " + offset,
-          ceph.TRACE);
+          + " and offset " + offset);
       String host = ceph.ceph_hosts(fh, offset);
 
-      ceph.debug(
+      LOG.trace(
           "getFileBlockLocations:return from ceph_hosts to Java with host "
-              + host,
-              ceph.TRACE);
+              + host);
       String[] hostArray = new String[1];
 
       hostArray[0] = host;
       locations[i] = new BlockLocation(hostArray, hostArray,
           start + i * blockSize - (start % blockSize), blockSize);
     }
-    ceph.debug("getFileBlockLocations:call ceph_close from Java on fh " + fh,
-        ceph.TRACE);
+    LOG.trace("getFileBlockLocations:call ceph_close from Java on fh " + fh);
     ceph.ceph_close(fh);
-    ceph.debug(
-        "getFileBlockLocations:return with " + locations.length + " locations",
-        ceph.DEBUG);
+    LOG.debug(
+        "getFileBlockLocations:return with " + locations.length + " locations");
     return locations;
   }
 
@@ -804,8 +787,7 @@ public class CephFileSystem extends FileSystem {
           "You have to initialize the "
               + "CephFileSystem before calling other methods.");
     }
-    ceph.debug("delete:enter with path " + path + " and recursive=" + recursive,
-        ceph.DEBUG);
+    LOG.debug("delete:enter with path " + path + " and recursive=" + recursive);
     Path abs_path = makeAbsolute(path);
 
     // sanity check
@@ -818,16 +800,14 @@ public class CephFileSystem extends FileSystem {
 
     // if the path is a file, try to delete it.
     if (isFile(abs_path)) {
-      ceph.debug("delete:calling ceph_unlink from Java with path " + abs_path,
-          ceph.TRACE);
+      LOG.trace("delete:calling ceph_unlink from Java with path " + abs_path);
       boolean result = ceph.ceph_unlink(abs_path.toString());
 
       if (!result) {
-        ceph.debug(
-            "delete: failed to delete file \"" + abs_path.toString() + "\".",
-            ceph.ERROR);
+        LOG.error(
+            "delete: failed to delete file \"" + abs_path.toString() + "\".");
       }
-      ceph.debug("delete:exit with success=" + result, ceph.DEBUG);
+      LOG.debug("delete:exit with success=" + result);
       return result;
     }
 
@@ -837,25 +817,22 @@ public class CephFileSystem extends FileSystem {
     Path[] contents = listPaths(abs_path);
 
     if (contents == null) {
-      ceph.debug(
+      LOG.error(
           "delete: Failed to read contents of directory \""
-              + abs_path.toString() + "\" while trying to delete it, BAILING",
-              ceph.ERROR);
+              + abs_path.toString() + "\" while trying to delete it, BAILING");
       return false;
     }
     if (!recursive && contents.length > 0) {
       throw new IOException("Directories must be deleted recursively!");
     }
     // delete the entries
-    ceph.debug("delete: recursively calling delete on contents of " + abs_path,
-        ceph.DEBUG);
+    LOG.debug("delete: recursively calling delete on contents of " + abs_path);
     for (Path p : contents) {
       if (!delete(p, true)) {
-        ceph.debug(
+        LOG.error(
             "delete: Failed to delete file \"" + p.toString()
             + "\" while recursively deleting \"" + abs_path.toString()
-            + "\", BAILING",
-            ceph.ERROR);
+            + "\", BAILING");
         return false;
       }
     }
@@ -863,11 +840,10 @@ public class CephFileSystem extends FileSystem {
     boolean result = ceph.ceph_rmdir(abs_path.toString());
 
     if (!result) {
-      ceph.debug(
-          "delete: failed to delete \"" + abs_path.toString() + "\", BAILING",
-          ceph.ERROR);
+      LOG.error(
+          "delete: failed to delete \"" + abs_path.toString() + "\", BAILING");
     }
-    ceph.debug("delete:exit", ceph.DEBUG);
+    LOG.debug("delete:exit");
     return result;
   }
 
@@ -893,7 +869,7 @@ public class CephFileSystem extends FileSystem {
   // Makes a Path absolute. In a cheap, dirty hack, we're
   // also going to strip off any fs_default_name prefix we see.
   private Path makeAbsolute(Path path) {
-    ceph.debug("makeAbsolute:enter with path " + path, ceph.NOLOG);
+    LOG.debug("makeAbsolute:enter with path " + path);
     if (path == null) {
       return new Path("/");
     }
@@ -902,30 +878,30 @@ public class CephFileSystem extends FileSystem {
       Path stripped_path = new Path(
           path.toString().substring(fs_default_name.length()));
 
-      ceph.debug("makeAbsolute:exit with path " + stripped_path, ceph.NOLOG);
+      LOG.debug("makeAbsolute:exit with path " + stripped_path);
       return stripped_path;
     }
 
     if (path.isAbsolute()) {
-      ceph.debug("makeAbsolute:exit with path " + path, ceph.NOLOG);
+      LOG.debug("makeAbsolute:exit with path " + path);
       return path;
     }
     Path new_path = new Path(ceph.ceph_getcwd(), path);
 
-    ceph.debug("makeAbsolute:exit with path " + new_path, ceph.NOLOG);
+    LOG.debug("makeAbsolute:exit with path " + new_path);
     return new_path;
   }
 
   private Path[] listPaths(Path path) throws IOException {
-    ceph.debug("listPaths:enter with path " + path, ceph.NOLOG);
+    LOG.debug("listPaths:enter with path " + path);
     String dirlist[];
 
     Path abs_path = makeAbsolute(path);
 
     // If it's a directory, get the listing. Otherwise, complain and give up.
-    ceph.debug("calling ceph_getdir from Java with path " + abs_path, ceph.NOLOG);
+    LOG.debug("calling ceph_getdir from Java with path " + abs_path);
     dirlist = ceph.ceph_getdir(abs_path.toString());
-    ceph.debug("returning from ceph_getdir to Java", ceph.NOLOG);
+    LOG.debug("returning from ceph_getdir to Java");
 
     if (dirlist == null) {
       return null;
@@ -935,10 +911,9 @@ public class CephFileSystem extends FileSystem {
     Path[] paths = new Path[dirlist.length];
 
     for (int i = 0; i < dirlist.length; ++i) {
-      ceph.debug(
+      LOG.trace(
           "Raw enumeration of paths in \"" + abs_path.toString() + "\": \""
-          + dirlist[i] + "\"",
-          ceph.TRACE);
+          + dirlist[i] + "\"");
       // convert each listing to an absolute path
       Path raw_path = new Path(dirlist[i]);
 
@@ -948,7 +923,7 @@ public class CephFileSystem extends FileSystem {
         paths[i] = new Path(abs_path, raw_path);
       }
     }
-    ceph.debug("listPaths:exit", ceph.NOLOG);
+    LOG.debug("listPaths:exit");
     return paths;
   }
 

diff --git a/src/client/hadoop/ceph/CephInputStream.java b/src/client/hadoop/ceph/CephInputStream.java
index 6f350efbc575c29d0a0d1eb88c77baa39a5e7dfc..d9668d031ba2abc46356da4f0a1f7768d097a1f6 100644 (file)
--- a/src/client/hadoop/ceph/CephInputStream.java
+++ b/src/client/hadoop/ceph/CephInputStream.java
@@ -23,6 +23,8 @@ package org.apache.hadoop.fs.ceph;
 
 import java.io.IOException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSInputStream;
 
@@ -33,7 +35,7 @@ import org.apache.hadoop.fs.FSInputStream;
  * Ceph instance.
  */
 public class CephInputStream extends FSInputStream {
-
+  private static final Log LOG = LogFactory.getLog(CephInputStream.class);
   private boolean closed;
 
   private int fileHandle;
@@ -63,10 +65,9 @@ public class CephInputStream extends FSInputStream {
     closed = false;
     ceph = cephfs;
     buffer = new byte[bufferSize];
-    ceph.debug(
+    LOG.debug(
         "CephInputStream constructor: initializing stream with fh " + fh
-        + " and file length " + flength,
-        ceph.DEBUG);
+        + " and file length " + flength);
       
   }
 
@@ -114,10 +115,9 @@ public class CephInputStream extends FSInputStream {
   }
 
   public synchronized void seek(long targetPos) throws IOException {
-    ceph.debug(
+    LOG.trace(
         "CephInputStream.seek: Seeking to position " + targetPos + " on fd "
-        + fileHandle,
-        ceph.TRACE);
+        + fileHandle);
     if (targetPos > fileLength) {
       throw new IOException(
           "CephInputStream.seek: failed seek to position " + targetPos
@@ -150,10 +150,9 @@ public class CephInputStream extends FSInputStream {
    */
   @Override
   public synchronized int read() throws IOException {
-    ceph.debug(
+    LOG.trace(
         "CephInputStream.read: Reading a single byte from fd " + fileHandle
-        + " by calling general read function",
-        ceph.TRACE);
+        + " by calling general read function");
 
     byte result[] = new byte[1];
 
@@ -181,9 +180,8 @@ public class CephInputStream extends FSInputStream {
   @Override
   public synchronized int read(byte buf[], int off, int len)
     throws IOException {
-    ceph.debug(
-        "CephInputStream.read: Reading " + len + " bytes from fd " + fileHandle,
-        ceph.TRACE);
+    LOG.trace(
+        "CephInputStream.read: Reading " + len + " bytes from fd " + fileHandle);
       
     if (closed) {
       throw new IOException(
@@ -193,11 +191,10 @@ public class CephInputStream extends FSInputStream {
                        
     // ensure we're not past the end of the file
     if (getPos() >= fileLength) {
-      ceph.debug(
+      LOG.debug(
           "CephInputStream.read: cannot read " + len + " bytes from fd "
           + fileHandle + ": current position is " + getPos()
-          + " and file length is " + fileLength,
-          ceph.DEBUG);
+          + " and file length is " + fileLength);
                                
       return -1;
     }
@@ -230,10 +227,9 @@ public class CephInputStream extends FSInputStream {
       totalRead += read;
     } while (len > 0 && fillBuffer());
 
-    ceph.debug(
+    LOG.trace(
         "CephInputStream.read: Reading " + initialLen + " bytes from fd "
-        + fileHandle + ": succeeded in reading " + totalRead + " bytes",
-        ceph.TRACE);
+        + fileHandle + ": succeeded in reading " + totalRead + " bytes");
     return totalRead;
   }
 
@@ -242,7 +238,7 @@ public class CephInputStream extends FSInputStream {
    */
   @Override
   public void close() throws IOException {
-    ceph.debug("CephOutputStream.close:enter", ceph.TRACE);
+    LOG.trace("CephOutputStream.close:enter");
     if (!closed) {
       int result = ceph.ceph_close(fileHandle);
 
@@ -252,7 +248,7 @@ public class CephInputStream extends FSInputStream {
             "Close somehow failed!"
                 + "Don't try and use this stream again, though");
       }
-      ceph.debug("CephOutputStream.close:exit", ceph.TRACE);
+      LOG.trace("CephOutputStream.close:exit");
     }
   }
 }

diff --git a/src/client/hadoop/ceph/CephOutputStream.java b/src/client/hadoop/ceph/CephOutputStream.java
index 03ea3b9cc8b646318dfd7d67aa610d9168a1d2af..4c50f88467d3ddf209b3c178ead60a9964d3147b 100644 (file)
--- a/src/client/hadoop/ceph/CephOutputStream.java
+++ b/src/client/hadoop/ceph/CephOutputStream.java
@@ -25,6 +25,8 @@ package org.apache.hadoop.fs.ceph;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.Progressable;
 
@@ -35,7 +37,7 @@ import org.apache.hadoop.util.Progressable;
  * Ceph instance.
  */
 public class CephOutputStream extends OutputStream {
-
+  private static final Log LOG = LogFactory.getLog(CephOutputStream.class);
   private boolean closed;
 
   private CephFS ceph;
@@ -87,9 +89,8 @@ public class CephOutputStream extends OutputStream {
    */
   @Override
   public synchronized void write(int b) throws IOException {
-    ceph.debug(
-        "CephOutputStream.write: writing a single byte to fd " + fileHandle,
-        ceph.TRACE);
+    LOG.trace(
+        "CephOutputStream.write: writing a single byte to fd " + fileHandle);
 
     if (closed) {
       throw new IOException(
@@ -115,9 +116,8 @@ public class CephOutputStream extends OutputStream {
    */
   @Override
   public synchronized void write(byte buf[], int off, int len) throws IOException {
-    ceph.debug(
-        "CephOutputStream.write: writing " + len + " bytes to fd " + fileHandle,
-        ceph.TRACE);
+    LOG.trace(
+        "CephOutputStream.write: writing " + len + " bytes to fd " + fileHandle);
     // make sure stream is open
     if (closed) {
       throw new IOException(
@@ -203,7 +203,7 @@ public class CephOutputStream extends OutputStream {
    */
   @Override
   public synchronized void close() throws IOException {
-    ceph.debug("CephOutputStream.close:enter", ceph.TRACE);
+    LOG.trace("CephOutputStream.close:enter");
     if (!closed) {
       flush();
       int result = ceph.ceph_close(fileHandle);
@@ -213,7 +213,7 @@ public class CephOutputStream extends OutputStream {
       }
                                
       closed = true;
-      ceph.debug("CephOutputStream.close:exit", ceph.TRACE);
+      LOG.trace("CephOutputStream.close:exit");
     }
   }
 }

diff --git a/src/client/hadoop/ceph/CephTalker.java b/src/client/hadoop/ceph/CephTalker.java
index b2e9909c7efe2178b22777035dd33444920bff90..9809bd8fd64711c0f532341b217561d9bd3b0b0f 100644 (file)
--- a/src/client/hadoop/ceph/CephTalker.java
+++ b/src/client/hadoop/ceph/CephTalker.java
@@ -32,7 +32,6 @@ class CephTalker extends CephFS {
 
   // we write a constructor so we can load the libraries
   public CephTalker(Configuration conf, Log log) {
-    super(conf, log);
     System.load(conf.get("fs.ceph.libDir") + "/libcephfs.so");
     System.load(conf.get("fs.ceph.libDir") + "/libhadoopcephfs.so");
     cluster = 0;