Merge pull request #6996 from OdumInstitute/6927_download_timeout

increase default payara request timeout

doc/sphinx-guides/source/installation/config.rst

@@ -1208,6 +1208,20 @@ This setting is useful in cases such as running Dataverse behind load balancers
 	"HTTP_VIA",
 	"REMOTE_ADDR"
 
+.. _:ApplicationServerSettings:
+
+Application Server Settings
+---------------------------
+
+http.request-timeout-seconds
+++++++++++++++++++++++++++++
+
+To facilitate large file upload and download, the Dataverse installer bumps the Payara **server-config.network-config.protocols.protocol.http-listener-1.http.request-timeout-seconds** setting from its default 900 seconds (15 minutes) to 1800 (30 minutes). Should you wish to shorten or lengthen this window, issue for example:
+
+``./asadmin set server-config.network-config.protocols.protocol.http-listener-1.http.request-timeout-seconds=3600``
+
+and restart Payara to apply your change.
+
 .. _database-settings:
 
 Database Settings

scripts/installer/as-setup.sh

@@ -12,6 +12,7 @@
 # GLASSFISH_DOMAIN
 # ASADMIN_OPTS
 # MEM_HEAP_SIZE
+# GLASSFISH_REQUEST_TIMEOUT
 #
 # database configuration: 
 # DB_PORT
@@ -114,9 +115,13 @@ function preliminary_setup()
   ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.mdcbaseurlstring=$DOI_MDCBASEURL_ESC"
 
   ./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.timerServer=true"
+
   # enable comet support
   ./asadmin $ASADMIN_OPTS set server-config.network-config.protocols.protocol.http-listener-1.http.comet-support-enabled="true"
 
+  # bump the http-listener timeout from 900 to 3600
+  ./asadmin $ASADMIN_OPTS set server-config.network-config.protocols.protocol.http-listener-1.http.request-timeout-seconds="${GLASSFISH_REQUEST_TIMEOUT}"
+
   ./asadmin $ASADMIN_OPTS delete-connector-connection-pool --cascade=true jms/__defaultConnectionFactory-Connection-Pool 
 
   # no need to explicitly delete the connector resource for the connection pool deleted in the step 

scripts/installer/default.config

@@ -5,6 +5,7 @@ GLASSFISH_DIRECTORY = /usr/local/payara5
 GLASSFISH_ADMIN_USER = admin
 GLASSFISH_ADMIN_PASSWORD = secret
 GLASSFISH_HEAP = 2048
+GLASSFISH_REQUEST_TIMEOUT = 1800
 
 [database]
 POSTGRES_ONLY = false

scripts/installer/installAppServer.py

@@ -12,6 +12,7 @@ def runAsadminScript(config):
    os.environ['HOST_ADDRESS'] = config.get('glassfish','HOST_DNS_ADDRESS')
    os.environ['GLASSFISH_ROOT'] = config.get('glassfish','GLASSFISH_DIRECTORY')
    os.environ['MEM_HEAP_SIZE'] = config.get('glassfish','GLASSFISH_HEAP')
+   os.environ['GLASSFISH_REQUEST_TIMEOUT'] = config.get('glassfish','GLASSFISH_REQUEST_TIMEOUT')
 
    os.environ['DB_PORT'] = config.get('database','POSTGRES_PORT')
    os.environ['DB_HOST'] = config.get('database','POSTGRES_SERVER')

scripts/installer/interactive.config

@@ -5,6 +5,7 @@ GLASSFISH_ADMIN_PASSWORD =
 GLASSFISH_DIRECTORY = App. Server (Payara) Directory
 GLASSFISH_HEAP =
 GLASSFISH_USER = Payara service account username
+GLASSFISH_REQUEST_TIMEOUT = Payara download timeout
 POSTGRES_ONLY =
 POSTGRES_ADMIN_PASSWORD = Postgres ADMIN password
 POSTGRES_SERVER = Postgres Server Address
@@ -28,6 +29,7 @@ DOI_MDCBASEURL = Datacite MakeDataCount URL
 HOST_DNS_ADDRESS = :(enter numeric IP address, if FQDN is unavailable)
 GLASSFISH_USER = :This user will be running the App. Server (Payara5) service on your system.\n - If this is a dev. environment, this should be your own username; \n - In production, we suggest you create the account "dataverse", or use any other unprivileged user account\n:
 GLASSFISH_DIRECTORY = 
+GLASSFISH_REQUEST_TIMEOUT = :\n Defaults to 1800 seconds (30 minutes)
 ADMIN_EMAIL = :\n(please enter a valid email address!) 
 MAIL_SERVER = 
 POSTGRES_SERVER =