Author: jlowe
Date: Mon Oct 7 22:26:48 2013
New Revision: 1530097
URL: http://svn.apache.org/r1530097
Log:
svn merge -c 1530095 FIXES: YARN-465. fix coverage
org.apache.hadoop.yarn.server.webproxy. Contributed by Aleksey Gorshkov and
Andrey Klochkov
Added:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java
- copied unchanged from r1530095,
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/TestWebAppProxyServlet.java
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1530097&r1=1530096&r2=1530097&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Mon Oct 7
22:26:48 2013
@@ -39,6 +39,9 @@ Release 2.3.0 - UNRELEASED
YARN-1232. Configuration to support multiple RMs (Karthik Kambatla via
bikas)
+ YARN-465. fix coverage org.apache.hadoop.yarn.server.webproxy (Aleksey
+ Gorshkov and Andrey Klochkov via jlowe)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java?rev=1530097&r1=1530096&r2=1530097&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java
Mon Oct 7 22:26:48 2013
@@ -73,30 +73,32 @@ public class WebAppProxyServer extends C
YarnConfiguration.PROXY_PRINCIPAL);
}
- /**
- * Wait for service to finish.
- * (Normally, it runs forever.)
- */
- private void join() {
- proxy.join();
- }
-
public static void main(String[] args) {
Thread.setDefaultUncaughtExceptionHandler(new
YarnUncaughtExceptionHandler());
StringUtils.startupShutdownMessage(WebAppProxyServer.class, args, LOG);
try {
- WebAppProxyServer proxy = new WebAppProxyServer();
- ShutdownHookManager.get().addShutdownHook(
- new CompositeServiceShutdownHook(proxy),
- SHUTDOWN_HOOK_PRIORITY);
- YarnConfiguration conf = new YarnConfiguration();
- proxy.init(conf);
- proxy.start();
- proxy.join();
+ WebAppProxyServer proxyServer = startServer();
+ proxyServer.proxy.join();
} catch (Throwable t) {
LOG.fatal("Error starting Proxy server", t);
System.exit(-1);
}
}
+ /**
+ * Start proxy server.
+ *
+ * @return proxy server instance.
+ */
+ protected static WebAppProxyServer startServer() throws Exception {
+ WebAppProxyServer proxy = new WebAppProxyServer();
+ ShutdownHookManager.get().addShutdownHook(
+ new CompositeServiceShutdownHook(proxy), SHUTDOWN_HOOK_PRIORITY);
+ YarnConfiguration configuration = new YarnConfiguration();
+ configuration.set(YarnConfiguration.PROXY_ADDRESS, "localhost:9099");
+ proxy.init(configuration);
+ proxy.start();
+ return proxy;
+ }
+
}
