You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by js...@apache.org on 2017/06/27 06:39:28 UTC
[47/50] [abbrv] incubator-livy git commit: LIVY-358. Make JettyServer
Http request and response header size configurable (#329)
LIVY-358. Make JettyServer Http request and response header size configurable (#329)
* Provide Jetty Http Request/Response Header Size Configuration
Kerberos over http requires larger header sizes than the default,
or the HTTP Error 413 Request entity too large will be returned.
This patch increases the default for Livy to 128K and also allows
this to be configurable.
* Change the conf key name
Change-Id: Id274c8cc60d30e5d778f9c447502b7e7a789a8f0
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/59af39d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/59af39d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/59af39d7
Branch: refs/heads/master
Commit: 59af39d7e7c85e10603fb66ad2997384cab1dcd0
Parents: d51e998
Author: Saisai Shao <sa...@gmail.com>
Authored: Sat May 13 00:45:42 2017 +0800
Committer: Jeff Zhang <zj...@gmail.com>
Committed: Fri May 12 09:45:42 2017 -0700
----------------------------------------------------------------------
.../main/scala/com/cloudera/livy/LivyConf.scala | 18 +++++++++---------
.../com/cloudera/livy/server/WebServer.scala | 7 ++++++-
2 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/59af39d7/server/src/main/scala/com/cloudera/livy/LivyConf.scala
----------------------------------------------------------------------
diff --git a/server/src/main/scala/com/cloudera/livy/LivyConf.scala b/server/src/main/scala/com/cloudera/livy/LivyConf.scala
index 233aa63..b347c2d 100644
--- a/server/src/main/scala/com/cloudera/livy/LivyConf.scala
+++ b/server/src/main/scala/com/cloudera/livy/LivyConf.scala
@@ -62,10 +62,14 @@ object LivyConf {
val SERVER_HOST = Entry("livy.server.host", "0.0.0.0")
val SERVER_PORT = Entry("livy.server.port", 8998)
- val CSRF_PROTECTION = LivyConf.Entry("livy.server.csrf-protection.enabled", false)
val UI_ENABLED = Entry("livy.ui.enabled", true)
+ val REQUEST_HEADER_SIZE = Entry("livy.server.request-header.size", 131072)
+ val RESPONSE_HEADER_SIZE = Entry("livy.server.response-header.size", 131072)
+
+ val CSRF_PROTECTION = Entry("livy.server.csrf-protection.enabled", false)
+
val IMPERSONATION_ENABLED = Entry("livy.impersonation.enabled", false)
val SUPERUSERS = Entry("livy.superusers", null)
@@ -83,14 +87,10 @@ object LivyConf {
val HEARTBEAT_WATCHDOG_INTERVAL = Entry("livy.server.heartbeat-watchdog.interval", "1m")
- val LAUNCH_KERBEROS_PRINCIPAL =
- LivyConf.Entry("livy.server.launch.kerberos.principal", null)
- val LAUNCH_KERBEROS_KEYTAB =
- LivyConf.Entry("livy.server.launch.kerberos.keytab", null)
- val LAUNCH_KERBEROS_REFRESH_INTERVAL =
- LivyConf.Entry("livy.server.launch.kerberos.refresh-interval", "1h")
- val KINIT_FAIL_THRESHOLD =
- LivyConf.Entry("livy.server.launch.kerberos.kinit-fail-threshold", 5)
+ val LAUNCH_KERBEROS_PRINCIPAL = Entry("livy.server.launch.kerberos.principal", null)
+ val LAUNCH_KERBEROS_KEYTAB = Entry("livy.server.launch.kerberos.keytab", null)
+ val LAUNCH_KERBEROS_REFRESH_INTERVAL = Entry("livy.server.launch.kerberos.refresh-interval", "1h")
+ val KINIT_FAIL_THRESHOLD = Entry("livy.server.launch.kerberos.kinit-fail-threshold", 5)
/**
* Recovery mode of Livy. Possible values:
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/59af39d7/server/src/main/scala/com/cloudera/livy/server/WebServer.scala
----------------------------------------------------------------------
diff --git a/server/src/main/scala/com/cloudera/livy/server/WebServer.scala b/server/src/main/scala/com/cloudera/livy/server/WebServer.scala
index 8f21180..298e696 100644
--- a/server/src/main/scala/com/cloudera/livy/server/WebServer.scala
+++ b/server/src/main/scala/com/cloudera/livy/server/WebServer.scala
@@ -36,10 +36,15 @@ class WebServer(livyConf: LivyConf, var host: String, var port: Int) extends Log
val (connector, protocol) = Option(livyConf.get(LivyConf.SSL_KEYSTORE)) match {
case None =>
- (new ServerConnector(server), "http")
+ val http = new HttpConfiguration()
+ http.setRequestHeaderSize(livyConf.getInt(LivyConf.REQUEST_HEADER_SIZE))
+ http.setResponseHeaderSize(livyConf.getInt(LivyConf.RESPONSE_HEADER_SIZE))
+ (new ServerConnector(server, new HttpConnectionFactory(http)), "http")
case Some(keystore) =>
val https = new HttpConfiguration()
+ https.setRequestHeaderSize(livyConf.getInt(LivyConf.REQUEST_HEADER_SIZE))
+ https.setResponseHeaderSize(livyConf.getInt(LivyConf.RESPONSE_HEADER_SIZE))
https.addCustomizer(new SecureRequestCustomizer())
val sslContextFactory = new SslContextFactory()