knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject knox git commit: KNOX-620: Jenkins Knox-master-verify failing since #725 due to JDK version issues. Sill more debugging.
Date Mon, 09 Nov 2015 19:01:37 GMT
Repository: knox
Updated Branches:
  refs/heads/master c9b24897e -> 2e530d3b6


KNOX-620: Jenkins Knox-master-verify failing since #725 due to JDK version issues. Sill more
debugging.


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/2e530d3b
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/2e530d3b
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/2e530d3b

Branch: refs/heads/master
Commit: 2e530d3b69a53d391213776d299cb1b5cc19543c
Parents: c9b2489
Author: Kevin Minder <kevin.minder@hortonworks.com>
Authored: Mon Nov 9 14:01:33 2015 -0500
Committer: Kevin Minder <kevin.minder@hortonworks.com>
Committed: Mon Nov 9 14:01:33 2015 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/gateway/GatewayMessages.java   | 4 ++--
 .../src/main/java/org/apache/hadoop/gateway/GatewayServer.java | 6 +++---
 .../java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java  | 1 +
 gateway-test/src/test/resources/log4j.properties               | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/2e530d3b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
index 0069f7a..7f68601 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
@@ -80,13 +80,13 @@ public interface GatewayMessages {
   @Message( level = MessageLevel.INFO, text = "Deploying topology {0} to {1}" )
   void deployingTopology( String clusterName, String warDirName );
 
-  @Message( level = MessageLevel.INFO, text = "Deployed topology {0}." )
+  @Message( level = MessageLevel.DEBUG, text = "Deployed topology {0}." )
   void deployedTopology( String clusterName );
 
   @Message( level = MessageLevel.INFO, text = "Loading topology {0} from {1}" )
   void redeployingTopology( String clusterName, String warDirName );
 
-  @Message( level = MessageLevel.INFO, text = "Redeployed topology {0}." )
+  @Message( level = MessageLevel.DEBUG, text = "Redeployed topology {0}." )
   void redeployedTopology( String clusterName );
 
   @Message( level = MessageLevel.ERROR, text = "Failed to deploy topology {0}: {1}" )

http://git-wip-us.apache.org/repos/asf/knox/blob/2e530d3b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
index 2235e8f..159a329 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
@@ -331,7 +331,7 @@ public class GatewayServer {
     jetty.setThreadPool( new QueuedThreadPool( config.getThreadPoolMax() ) );
 
     try {
-    jetty.start();
+      jetty.start();
     }
     catch (IOException e) {
       log.failedToStartGateway( e );
@@ -476,17 +476,17 @@ public class GatewayServer {
           File tmp = war.as( ExplodedExporter.class ).exportExploded( deployDir, warDir.getName()
+ ".tmp" );
           tmp.renameTo( warDir );
           internalDeploy( topology, warDir );
-          //log.deployedTopology( topology.getName());
           if (topology.getName().equals(config.getDefaultTopologyName())) {
             topology.setName("_default");
             handleCreateDeployment(topology, deployDir);
             topology.setName(config.getDefaultTopologyName());
           }
+          log.deployedTopology( topology.getName());
         } else {
           auditor.audit( Action.REDEPLOY, topology.getName(), ResourceType.TOPOLOGY, ActionOutcome.UNAVAILABLE
);
           log.redeployingTopology( topology.getName(), warDir.getAbsolutePath() );
           internalDeploy( topology, warDir );
-          //log.redeployedTopology( topology.getName() );
+          log.redeployedTopology( topology.getName() );
         }
       } catch( Throwable e ) {
         auditor.audit( Action.DEPLOY, topology.getName(), ResourceType.TOPOLOGY, ActionOutcome.FAILURE
);

http://git-wip-us.apache.org/repos/asf/knox/blob/2e530d3b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
index efc9782..c64eb11 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
@@ -128,6 +128,7 @@ public class GatewaySampleFuncTest {
     } catch ( ServiceLifecycleException e ) {
       e.printStackTrace(); // I18N not required.
     }
+
     gateway = GatewayServer.startGateway( testConfig, srvcs );
     MatcherAssert.assertThat( "Failed to start gateway.", gateway, notNullValue() );
 

http://git-wip-us.apache.org/repos/asf/knox/blob/2e530d3b/gateway-test/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/log4j.properties b/gateway-test/src/test/resources/log4j.properties
index 70a371b..638c3a4 100644
--- a/gateway-test/src/test/resources/log4j.properties
+++ b/gateway-test/src/test/resources/log4j.properties
@@ -30,7 +30,7 @@ log4j.logger.org.apache.hadoop.gateway.http.response.body=OFF
 
 log4j.logger.org.apache.directory=ERROR
 
-#log4j.logger.org.eclipse.jetty=DEBUG
+log4j.logger.org.eclipse.jetty=DEBUG
 #log4j.logger.org.apache.shiro=DEBUG
 #log4j.logger.org.apache.http=DEBUG
 #log4j.logger.org.apache.http.headers=DEBUG


Mime
View raw message