[HOPS-1553] Fixed ClusterJ logging

Author: smkniazi

NDB/clusterj-fixes/clusterj-fix.patch

@@ -33,7 +33,7 @@ index ac4fcf73..13cb3e1a 100644
              // if not using connection pooling, create a new session factory
              result = new SessionFactoryImpl(props);
          }
-+        System.out.println("HopsFS created a ClusterJ VERSION sesseion factory.");
++        logger.info("HopsFS created a ClusterJ VERSION sesseion factory.");
          return result;
      }
 

src/main/java/io/hops/metadata/ndb/DBSessionProvider.java

@@ -22,6 +22,7 @@
 import com.mysql.clusterj.ClusterJHelper;
 import com.mysql.clusterj.Constants;
 import com.mysql.clusterj.LockMode;
+import com.mysql.clusterj.core.util.LoggerFactory;
 import io.hops.exception.StorageException;
 import io.hops.metadata.ndb.wrapper.HopsExceptionHelper;
 import io.hops.metadata.ndb.wrapper.HopsSession;
@@ -66,11 +67,11 @@ public DBSessionProvider(Properties conf, int reuseCount, int initialPoolSize)
   }
 
   private void start(int initialPoolSize) throws StorageException {
-    System.out.println("Database connect string: " +
+    LOG.info("Database connect string: " +
         conf.get(Constants.PROPERTY_CLUSTER_CONNECTSTRING));
-    System.out.println(
+    LOG.info(
         "Database name: " + conf.get(Constants.PROPERTY_CLUSTER_DATABASE));
-    System.out.println("Max Transactions: " +
+    LOG.info("Max Transactions: " +
         conf.get(Constants.PROPERTY_CLUSTER_MAX_TRANSACTIONS));
     try {
       sessionFactory =

src/main/java/io/hops/metadata/ndb/dalimpl/hdfs/INodeClusterj.java

@@ -592,7 +592,6 @@ public List<INodeIdentifier> getAllINodeFiles(long startId, long endId)
     dobj.where(pred.not().and(pred2));
     HopsQuery<InodeDTO> query = session.createQuery(dobj);
     query.setParameter("isDirParam", NdbBoolean.convert(true));
-    //FIXME: InodeId is integer
     //startId is inclusive and endId exclusive
     query.setParameter("startId", startId);
     query.setParameter("endId", endId - 1);

src/main/java/io/hops/metadata/ndb/wrapper/HopsClusterJLogger.java

@@ -0,0 +1,89 @@
+package io.hops.metadata.ndb.wrapper;
+
+import com.mysql.clusterj.core.util.Logger;
+import org.apache.commons.logging.Log;
+
+public class HopsClusterJLogger implements Logger {
+
+  private static final String ENABLE_CLUSTERJ_LOGS_ENV = "ENABLE_CLUSTERJ_LOGS";
+  private static boolean ENABLE_CLUSTERJ_LOGS = false;
+
+  static {
+    String isLogStr = System.getenv(ENABLE_CLUSTERJ_LOGS_ENV);
+    try {
+      if(isLogStr != null) {
+        ENABLE_CLUSTERJ_LOGS = Boolean.parseBoolean(isLogStr);
+      }
+    } catch (Throwable t) {
+      System.err.println("Unable to parse "+ENABLE_CLUSTERJ_LOGS_ENV+" env variable");
+    }
+  }
+
+  private final Log LOG;
+
+  HopsClusterJLogger(Log delegate) {
+    LOG = delegate;
+  }
+
+  @Override
+  public void detail(String s) {
+    if (ENABLE_CLUSTERJ_LOGS)
+      LOG.trace(s);
+  }
+
+  @Override
+  public void debug(String s) {
+    if (ENABLE_CLUSTERJ_LOGS)
+      LOG.debug(s);
+  }
+
+  @Override
+  public void trace(String s) {
+    if (ENABLE_CLUSTERJ_LOGS)
+      LOG.trace(s);
+  }
+
+  @Override
+  public void info(String s) {
+    if (ENABLE_CLUSTERJ_LOGS)
+      LOG.info(s);
+  }
+
+  @Override
+  public void warn(String s) {
+    if (ENABLE_CLUSTERJ_LOGS)
+      LOG.warn(s);
+  }
+
+  @Override
+  public void error(String s) {
+    if (ENABLE_CLUSTERJ_LOGS)
+      LOG.error(s);
+  }
+
+  @Override
+  public void fatal(String s) {
+    if (ENABLE_CLUSTERJ_LOGS)
+      LOG.fatal(s);
+  }
+
+  @Override
+  public boolean isDetailEnabled() {
+    return ENABLE_CLUSTERJ_LOGS && LOG.isTraceEnabled();
+  }
+
+  @Override
+  public boolean isDebugEnabled() {
+    return ENABLE_CLUSTERJ_LOGS && LOG.isDebugEnabled();
+  }
+
+  @Override
+  public boolean isTraceEnabled() {
+    return ENABLE_CLUSTERJ_LOGS && LOG.isTraceEnabled();
+  }
+
+  @Override
+  public boolean isInfoEnabled() {
+    return ENABLE_CLUSTERJ_LOGS && LOG.isInfoEnabled();
+  }
+}

src/main/java/io/hops/metadata/ndb/wrapper/HopsExceptionHelper.java

@@ -77,7 +77,7 @@ private static boolean isOutOfDBExtents(ClusterJException e){
   }
 
   private static boolean isDeadLockException(ClusterJException e){
-    return isExceptionContains(e, 266);
+    return isExceptionContains(e, 266) || isExceptionContains(e, 274);
   }
 
   private static boolean isExceptionContains(ClusterJException e, int code){

src/main/java/io/hops/metadata/ndb/wrapper/HopsLoggerFactory.java

@@ -0,0 +1,57 @@
+package io.hops.metadata.ndb.wrapper;
+import com.mysql.clusterj.core.util.JDK14LoggerFactoryImpl;
+import com.mysql.clusterj.core.util.Logger;
+import com.mysql.clusterj.core.util.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class HopsLoggerFactory implements LoggerFactory{
+
+  static final Map<String, Logger> loggerMap = new HashMap<String, Logger>();
+
+  public HopsLoggerFactory() {
+    // create all the known loggers for the core project
+    registerLogger(JDK14LoggerFactoryImpl.CLUSTERJ_LOGGER);
+    registerLogger(JDK14LoggerFactoryImpl.CLUSTERJ_METADATA_LOGGER);
+    registerLogger(JDK14LoggerFactoryImpl.CLUSTERJ_QUERY_LOGGER);
+    registerLogger(JDK14LoggerFactoryImpl.CLUSTERJ_UTIL_LOGGER);
+  }
+
+  public Logger registerLogger(String loggerName) {
+    final Log log = LogFactory.getLog(loggerName);
+    Logger result = new HopsClusterJLogger(log);
+    loggerMap.put(loggerName, result);
+    return result;
+  }
+
+  @SuppressWarnings("unchecked")
+  public Logger getInstance(Class cls) {
+    String loggerName = getPackageName(cls);
+    return getInstance(loggerName);
+  }
+
+  public synchronized Logger getInstance(String loggerName) {
+    Logger result = loggerMap.get(loggerName);
+    if (result == null) {
+      result = registerLogger(loggerName);
+    }
+    return result;
+  }
+
+  /**
+   * Returns the package portion of the specified class.
+   * @param cls the class from which to extract the
+   * package
+   * @return package portion of the specified class
+   */
+  final private static String getPackageName(Class<?> cls)
+  {
+    String className = cls.getName();
+    int index = className.lastIndexOf('.');
+    return ((index != -1) ? className.substring(0, index) : ""); // NOI18N
+  }
+}