Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-13535. Add jetty6 acceptor startup issue workaround to branch-2. Contributed by Min Shen.

This commit is contained in:
Wei-Chiu Chuang 2016-09-23 14:25:52 -07:00
parent 6c98455728
commit 23984e1787
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SslSelectChannelConnectorSecure.java
View File

@ -23,6 +23,8 @@ import java.util.ArrayList;
import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngine;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.mortbay.jetty.security.SslSelectChannelConnector; import org.mortbay.jetty.security.SslSelectChannelConnector;
@ -34,6 +36,8 @@ import org.mortbay.jetty.security.SslSelectChannelConnector;
*/ */
@InterfaceAudience.Private @InterfaceAudience.Private
public class SslSelectChannelConnectorSecure extends SslSelectChannelConnector { public class SslSelectChannelConnectorSecure extends SslSelectChannelConnector {
public static final Log LOG =
LogFactory.getLog(SslSelectChannelConnectorSecure.class);
public SslSelectChannelConnectorSecure() { public SslSelectChannelConnectorSecure() {
super(); super();
@ -55,4 +59,29 @@ public class SslSelectChannelConnectorSecure extends SslSelectChannelConnector {
new String[nonSSLProtocols.size()])); new String[nonSSLProtocols.size()]));
return engine; return engine;
} }
/* Override the broken isRunning() method (JETTY-1316). This bug is present
* in 6.1.26. For the versions wihout this bug, it adds insignificant
* overhead.
*/
@Override
public boolean isRunning() {
if (super.isRunning()) {
return true;
}
// We might be hitting JETTY-1316. If the internal state changed from
// STARTING to STARTED in the middle of the check, the above call may
// return false. Check it one more time.
LOG.warn("HttpServer Acceptor: isRunning is false. Rechecking.");
try {
Thread.sleep(10);
} catch (InterruptedException ie) {
// Mark this thread as interrupted. Someone up in the call chain
// might care.
Thread.currentThread().interrupt();
}
boolean runState = super.isRunning();
LOG.warn("HttpServer Acceptor: isRunning is " + runState);
return runState;
}
} }