diff --git a/aspnet/src/Web.config b/aspnet/src/Web.config
index d07f4a409f0..ebd4fea1092 100644
--- a/aspnet/src/Web.config
+++ b/aspnet/src/Web.config
@@ -25,6 +25,11 @@
+
+
+
+
diff --git a/benchmarker.py b/benchmarker.py
index f94aa8d10d7..bd5d88253c3 100644
--- a/benchmarker.py
+++ b/benchmarker.py
@@ -244,7 +244,7 @@ def __setup_server(self):
try:
if os.name == 'nt':
return True
- subprocess.check_call("sudo sysctl -w net.core.somaxconn=1024".rsplit(" "))
+ subprocess.check_call("sudo sysctl -w net.core.somaxconn=5000".rsplit(" "))
subprocess.check_call("sudo -s ulimit -n 8192".rsplit(" "))
subprocess.check_call("sudo sysctl net.ipv4.tcp_tw_reuse=1".rsplit(" "))
subprocess.check_call("sudo sysctl net.ipv4.tcp_tw_recycle=1".rsplit(" "))
@@ -265,7 +265,7 @@ def __setup_server(self):
def __setup_client(self):
p = subprocess.Popen(self.ssh_string, stdin=subprocess.PIPE, shell=True)
p.communicate("""
- sudo sysctl -w net.core.somaxconn=1024
+ sudo sysctl -w net.core.somaxconn=5000
sudo -s ulimit -n 8192
sudo sysctl net.ipv4.tcp_tw_reuse=1
sudo sysctl net.ipv4.tcp_tw_recycle=1
diff --git a/installer.py b/installer.py
index 3586a3df258..57547a4554e 100644
--- a/installer.py
+++ b/installer.py
@@ -1,5 +1,6 @@
import subprocess
import os
+import time
class Installer:
@@ -31,7 +32,7 @@ def __install_server_software(self):
self.__run_command("sudo apt-get install gcc-4.8 g++-4.8", True)
self.__run_command("cp ../config/benchmark_profile ../../.bash_profile")
- self.__run_command("sudo sh -c \"echo '* soft nofile 8192' >> /etc/security/limits.conf\"")
+ self.__run_command("sudo sh -c \"echo '* - nofile 8192' >> /etc/security/limits.conf\"")
#######################################
# Languages
@@ -110,7 +111,17 @@ def __install_server_software(self):
# Perl
#
- self.__run_command("curl http://downloads.activestate.com/ActivePerl/releases/5.16.3.1603/ActivePerl-5.16.3.1603-x86_64-linux-glibc-2.3.5-296746.tar.gz | tar xvz");
+ # Sometimes this HTTP server returns 404, so retry a few times until it works, but don't retry forever
+ tries = 0
+ while True:
+ self.__run_command("curl http://downloads.activestate.com/ActivePerl/releases/5.16.3.1603/ActivePerl-5.16.3.1603-x86_64-linux-glibc-2.3.5-296746.tar.gz | tar xvz");
+ if os.path.exists(os.path.join('installs', 'ActivePerl-5.16.3.1603-x86_64-linux-glibc-2.3.5-296746')):
+ break
+ tries += 1
+ if tries >= 30:
+ raise Exception('Could not download ActivePerl after many retries')
+ time.sleep(5)
+
self.__run_command("sudo ./install.sh --license-accepted --prefix /opt/ActivePerl-5.16 --no-install-html", cwd="ActivePerl-5.16.3.1603-x86_64-linux-glibc-2.3.5-296746", send_yes=True)
self.__run_command("curl -L http://cpanmin.us | perl - --sudo App::cpanminus")
self.__run_command("cpanm -f -S DBI DBD::mysql Kelp Dancer Mojolicious Kelp::Module::JSON::XS Dancer::Plugin::Database Starman Plack JSON Web::Simple DBD::Pg JSON::XS EV HTTP::Parser::XS Monoceros")
@@ -278,7 +289,7 @@ def __install_server_software(self):
##############################
# Vert.x
##############################
- self.__run_command("curl http://vertx.io/downloads/vert.x-1.3.1.final.tar.gz | tar xvz")
+ self.__run_command("curl http://vert-x.github.io/vertx-downloads/downloads/vert.x-1.3.1.final.tar.gz | tar xvz")
##############################
# Yesod
@@ -322,7 +333,7 @@ def __install_client_software(self):
##############################
yes | sudo apt-get update
yes | sudo apt-get install build-essential git libev-dev libpq-dev libreadline6-dev postgresql
- sudo sh -c "echo '* soft nofile 8192' >> /etc/security/limits.conf"
+ sudo sh -c "echo '* - nofile 8192' >> /etc/security/limits.conf"
sudo mkdir -p /ssd
sudo mkdir -p /ssd/log