YARN-11123. ResourceManager webapps test failures due to org.apache.hadoop.metrics2.MetricsException and subsequent java.net.BindException: Address already in use. Contributed by Szilard Nemeth
This commit is contained in:
parent
dad2900b87
commit
eced5bec68
@ -25,6 +25,11 @@
|
|||||||
public class WebAppException extends YarnRuntimeException {
|
public class WebAppException extends YarnRuntimeException {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
private WebApp webApp;
|
||||||
|
|
||||||
|
public WebApp getWebApp() {
|
||||||
|
return webApp;
|
||||||
|
}
|
||||||
|
|
||||||
public WebAppException(String msg) {
|
public WebAppException(String msg) {
|
||||||
super(msg);
|
super(msg);
|
||||||
@ -35,6 +40,11 @@ public WebAppException(Throwable cause) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public WebAppException(String msg, Throwable cause) {
|
public WebAppException(String msg, Throwable cause) {
|
||||||
|
this(msg, cause, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public WebAppException(String msg, Throwable cause, WebApp webApp) {
|
||||||
super(msg, cause);
|
super(msg, cause);
|
||||||
|
this.webApp = webApp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -476,7 +476,7 @@ public WebApp start(WebApp webapp, WebAppContext ui2Context) {
|
|||||||
LOG.info("Web app " + name + " started at "
|
LOG.info("Web app " + name + " started at "
|
||||||
+ httpServer.getConnectorAddress(0).getPort());
|
+ httpServer.getConnectorAddress(0).getPort());
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new WebAppException("Error starting http server", e);
|
throw new WebAppException("Error starting http server", e, webApp);
|
||||||
}
|
}
|
||||||
return webApp;
|
return webApp;
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
import com.sun.jersey.spi.container.servlet.ServletContainer;
|
import com.sun.jersey.spi.container.servlet.ServletContainer;
|
||||||
|
|
||||||
import org.apache.hadoop.yarn.metrics.GenericEventTypeMetrics;
|
import org.apache.hadoop.yarn.metrics.GenericEventTypeMetrics;
|
||||||
|
import org.apache.hadoop.yarn.webapp.WebAppException;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.slf4j.Marker;
|
import org.slf4j.Marker;
|
||||||
@ -1440,7 +1441,12 @@ protected void startWepApp() {
|
|||||||
IsResourceManagerActiveServlet.PATH_SPEC,
|
IsResourceManagerActiveServlet.PATH_SPEC,
|
||||||
IsResourceManagerActiveServlet.class);
|
IsResourceManagerActiveServlet.class);
|
||||||
|
|
||||||
webApp = builder.start(new RMWebApp(this), uiWebAppContext);
|
try {
|
||||||
|
webApp = builder.start(new RMWebApp(this), uiWebAppContext);
|
||||||
|
} catch (WebAppException e) {
|
||||||
|
webApp = e.getWebApp();
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getWebAppsPath(String appName) {
|
private String getWebAppsPath(String appName) {
|
||||||
|
Loading…
Reference in New Issue
Block a user