Skip reducing log-level for hive metastore if log-level is fine or lower

for log-level as fine and below, skip changing hive metastore log-level
ashetkar · Jan 6, 2018 · 29b4453 · 29b4453
1 parent 15bafd9
commit 29b4453
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/GFToSlf4jBridge.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/GFToSlf4jBridge.java
@@ -60,24 +60,27 @@ public void setLevel(int level) {
   public void put(int level, String msg, Throwable exception) {
     Logger log = getLogger();
     switch (level) {
-      case SEVERE_LEVEL:
-      case ERROR_LEVEL:
-        log.error(msg, exception);
-        break;
-      case WARNING_LEVEL:
-        log.warn(msg, exception);
-        break;
       case INFO_LEVEL:
       case CONFIG_LEVEL:
         log.info(msg, exception);
         break;
+      case WARNING_LEVEL:
+        log.warn(msg, exception);
+        break;
       case FINE_LEVEL:
         log.debug(msg, exception);
         break;
+      case SEVERE_LEVEL:
+      case ERROR_LEVEL:
+        log.error(msg, exception);
+        break;
       case FINER_LEVEL:
       case FINEST_LEVEL:
+      case ALL_LEVEL:
         log.trace(msg, exception);
         break;
+      case NONE_LEVEL:
+        break;
       default:
         log.debug(msg, exception);
         break;

diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/db/FabricDatabase.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/db/FabricDatabase.java
@@ -1567,17 +1567,18 @@ public String executeDDL(final DDLConflatable conflatable,
       // line of logs which are of no use. Once the hive meta tables are
       // done, restore the logging level.
       if (previousLevel == Integer.MAX_VALUE &&
-          Misc.isSnappyHiveMetaTable(currentSchema))
-      {
+          Misc.isSnappyHiveMetaTable(currentSchema)) {
         GFToSlf4jBridge bridgeLogger = ((GFToSlf4jBridge)logger);
-        bridgeLogger.info("Starting hive meta-store initialization");
-        previousLevel = bridgeLogger.getLevel();
-        bridgeLogger.setLevel(LogWriterImpl.WARNING_LEVEL);
+        int currentLevel = bridgeLogger.getLevel();
+        if (currentLevel == LogWriterImpl.CONFIG_LEVEL ||
+            currentLevel == LogWriterImpl.INFO_LEVEL) {
+          previousLevel = currentLevel;
+          bridgeLogger.setLevel(LogWriterImpl.WARNING_LEVEL);
+        }
       } else if (previousLevel != Integer.MAX_VALUE &&
             Misc.isSnappyHiveMetaTable(lastCurrentSchema)) {
           GFToSlf4jBridge bridgeLogger = ((GFToSlf4jBridge)logger);
           bridgeLogger.setLevel(previousLevel);
-          bridgeLogger.info("Done hive meta-store initialization");
           previousLevel = Integer.MAX_VALUE;
       }
       // set the default schema masquerading as the user

diff --git a/.../src/main/java/com/pivotal/gemfirexd/internal/engine/fabricservice/FabricServiceImpl.java b/.../src/main/java/com/pivotal/gemfirexd/internal/engine/fabricservice/FabricServiceImpl.java
@@ -733,12 +733,12 @@ private NetworkInterface startNetworkServerImpl(String bindAddress, int port,
         netImpl.internalStart(networkProperties);
         retry = false;
       } catch (GemFireXDRuntimeException e) {
-        if (retry && numTries <= 10) {
+        if (retry && numTries <= 50) {
           // retry with an incremented port.
           netImpl.setPort(++port);
         } else throw e;
       }
-    } while (retry && numTries <= 10);
+    } while (retry && numTries <= 50);
 
     if (netImpl.getServerType().isThrift()) {
       serverType += (" (" + netImpl.getServerType().getProtocolString() + ')');