Patch back changes from centos-7 branch.

Author: jdeathe

Dockerfile

@@ -40,6 +40,7 @@ RUN ln -sf \
 	&& chgrp redis \
 		/usr/sbin/redis-server-wrapper \
 	&& sed -i -r \
+		-e "s~^(logfile ).+$~\1\"\"~" \
 		-e "s~^(bind ).+$~\10.0.0.0~" \
 		-e "s~^(# *)?(maxmemory ).+$~\2{{REDIS_MAXMEMORY}}~" \
 		-e "s~^(# *)?(maxmemory-policy ).+$~\2{{REDIS_MAXMEMORY_POLICY}}~" \
@@ -59,8 +60,8 @@ ENV REDIS_AUTOSTART_REDIS_BOOTSTRAP="true" \
 	REDIS_MAXMEMORY_SAMPLES="5" \
 	REDIS_OPTIONS="" \
 	REDIS_TCP_BACKLOG="1024" \
-	SSH_AUTOSTART_SSHD=false \
-	SSH_AUTOSTART_SSHD_BOOTSTRAP=false
+	SSH_AUTOSTART_SSHD="false" \
+	SSH_AUTOSTART_SSHD_BOOTSTRAP="false"
 
 # -----------------------------------------------------------------------------
 # Set image metadata

README.md

@@ -66,14 +66,14 @@ $ docker run \
   --detach \
   --name redis.pool-1.1.1 \
   --publish 6379:6379/tcp \
+  --sysctl "net.core.somaxconn=2048" \
+  --sysctl "net.ipv4.ip_local_port_range=1024 65535" \
+  --sysctl "net.ipv4.route.flush=1" \
   --env "REDIS_MAXMEMORY=32mb" \
   --env "REDIS_MAXMEMORY_POLICY=allkeys-lru" \
   --env "REDIS_MAXMEMORY_SAMPLES=10" \
   --env "REDIS_OPTIONS=--loglevel verbose" \
   --env "REDIS_TCP_BACKLOG=2048" \
-  --sysctl "net.core.somaxconn=2048" \
-  --sysctl "net.ipv4.ip_local_port_range=1024 65535" \
-  --sysctl "net.ipv4.route.flush=1" \
   jdeathe/centos-ssh-redis:1.0.0
 ```
 

default.mk

@@ -3,6 +3,9 @@
 define DOCKER_CONTAINER_PARAMETERS
 --name $(DOCKER_NAME) \
 --restart $(DOCKER_RESTART_POLICY) \
+--sysctl "net.core.somaxconn=$(SYSCTL_NET_CORE_SOMAXCONN)" \
+--sysctl "net.ipv4.ip_local_port_range=$(SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE)" \
+--sysctl "net.ipv4.route.flush=$(SYSCTL_NET_IPV4_ROUTE_FLUSH)" \
 --env "REDIS_AUTOSTART_REDIS_BOOTSTRAP=$(REDIS_AUTOSTART_REDIS_BOOTSTRAP)" \
 --env "REDIS_AUTOSTART_REDIS_WRAPPER=$(REDIS_AUTOSTART_REDIS_WRAPPER)" \
 --env "REDIS_MAXMEMORY=$(REDIS_MAXMEMORY)" \

environment.mk

@@ -13,6 +13,11 @@ DOCKER_IMAGE_RELEASE_TAG_PATTERN := ^(1|centos-6-1)\.[0-9]+\.[0-9]+$
 # Variables
 # -----------------------------------------------------------------------------
 
+# Docker --sysctl settings
+SYSCTL_NET_CORE_SOMAXCONN ?= 1024
+SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE ?= 1024 65535
+SYSCTL_NET_IPV4_ROUTE_FLUSH ?= 1
+
 # Docker image/container settings
 DOCKER_CONTAINER_OPTS ?=
 DOCKER_IMAGE_TAG ?= latest

src/etc/services-config/supervisor/supervisord.d/redis-server-wrapper.conf

@@ -2,9 +2,9 @@
 priority = 100
 command = /usr/sbin/redis-server-wrapper
 autostart = %(ENV_REDIS_AUTOSTART_REDIS_WRAPPER)s
-startsecs = 0
+startsecs = 1
 autorestart = true
 redirect_stderr = true
-stdout_logfile = /var/log/redis-server-wrapper
+stdout_logfile = /var/log/redis/redis.log
 stdout_events_enabled = true
 user = redis

src/etc/systemd/system/centos-ssh-redis@.service

@@ -59,9 +59,12 @@ Environment="REDIS_AUTOSTART_REDIS_BOOTSTRAP=true"
 Environment="REDIS_AUTOSTART_REDIS_WRAPPER=true"
 Environment="REDIS_MAXMEMORY=64mb"
 Environment="REDIS_MAXMEMORY_POLICY=allkeys-lru"
-Environment="REDIS_MAXMEMORY_SAMPLES=10"
+Environment="REDIS_MAXMEMORY_SAMPLES=5"
 Environment="REDIS_OPTIONS="
 Environment="REDIS_TCP_BACKLOG=1024"
+Environment="SYSCTL_NET_CORE_SOMAXCONN=1024"
+Environment="SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE=1024 65535"
+Environment="SYSCTL_NET_IPV4_ROUTE_FLUSH=1"
 
 # Initialisation: Load image from local storage if available, otherwise pull.
 ExecStartPre=/bin/bash -c \
@@ -91,6 +94,9 @@ ExecStartPre=-/bin/bash -c \
 ExecStart=/bin/bash -c \
   "exec /usr/bin/docker run \
     --name %p.%i \
+    --sysctl \"net.core.somaxconn=${SYSCTL_NET_CORE_SOMAXCONN}\" \
+    --sysctl \"net.ipv4.ip_local_port_range=${SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE}\" \
+    --sysctl \"net.ipv4.route.flush=${SYSCTL_NET_IPV4_ROUTE_FLUSH}\" \
     --env \"REDIS_AUTOSTART_REDIS_BOOTSTRAP=${REDIS_AUTOSTART_REDIS_BOOTSTRAP}\" \
     --env \"REDIS_AUTOSTART_REDIS_WRAPPER=${REDIS_AUTOSTART_REDIS_WRAPPER}\" \
     --env \"REDIS_MAXMEMORY=${REDIS_MAXMEMORY}\" \

src/opt/scmi/default.sh

@@ -40,6 +40,9 @@ fi
 # Common parameters of create and run targets
 DOCKER_CONTAINER_PARAMETERS="--name ${DOCKER_NAME} \
 --restart ${DOCKER_RESTART_POLICY} \
+--sysctl \"net.core.somaxconn=${SYSCTL_NET_CORE_SOMAXCONN}\" \
+--sysctl \"net.ipv4.ip_local_port_range=${SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE}\" \
+--sysctl \"net.ipv4.route.flush=${SYSCTL_NET_IPV4_ROUTE_FLUSH}\" \
 --env \"REDIS_AUTOSTART_REDIS_BOOTSTRAP=${REDIS_AUTOSTART_REDIS_BOOTSTRAP}\" \
 --env \"REDIS_AUTOSTART_REDIS_WRAPPER=${REDIS_AUTOSTART_REDIS_WRAPPER}\" \
 --env \"REDIS_MAXMEMORY=${REDIS_MAXMEMORY}\" \

src/opt/scmi/environment.sh

@@ -30,6 +30,11 @@ DIST_PATH="${DIST_PATH:-./dist}"
 # Number of seconds expected to complete container startup including bootstrap.
 STARTUP_TIME="${STARTUP_TIME:-1}"
 
+# Docker --sysctl settings
+SYSCTL_NET_CORE_SOMAXCONN="${SYSCTL_NET_CORE_SOMAXCONN:-1024}"
+SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE="${SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE:-1024 65535}"
+SYSCTL_NET_IPV4_ROUTE_FLUSH="${SYSCTL_NET_IPV4_ROUTE_FLUSH:-1}"
+
 # ETCD register service settings
 REGISTER_ETCD_PARAMETERS="${REGISTER_ETCD_PARAMETERS:-}"
 REGISTER_TTL="${REGISTER_TTL:-60}"

src/opt/scmi/service-unit.sh

@@ -14,6 +14,9 @@ readonly SERVICE_UNIT_ENVIRONMENT_KEYS="
  REDIS_MAXMEMORY_SAMPLES
  REDIS_OPTIONS
  REDIS_TCP_BACKLOG
+ SYSCTL_NET_CORE_SOMAXCONN
+ SYSCTL_NET_IPV4_IP_LOCAL_PORT_RANGE
+ SYSCTL_NET_IPV4_ROUTE_FLUSH
 "
 readonly SERVICE_UNIT_REGISTER_ENVIRONMENT_KEYS="
  REGISTER_ETCD_PARAMETERS

src/usr/sbin/redis-server-bootstrap

@@ -4,6 +4,7 @@ set -e
 
 readonly CONFIG_PATH="/etc/redis.conf"
 readonly LOCK_FILE="/var/lock/subsys/redis-server-bootstrap"
+readonly LOG_FILE="/var/log/redis/redis.log"
 readonly OPTIONS="${REDIS_OPTIONS:-}"
 readonly TIMER_START="$(
 	date +%s.%N
@@ -32,29 +33,50 @@ function load_config ()
 	fi
 }
 
+function set_log_write_user ()
+{
+	local file_path="${1:-}"
+	local user="${2:-}"
+
+	if [[ ! -f ${file_path} ]]
+	then
+		touch \
+			"${file_path}"
+	fi
+
+	chown \
+		"${user}":"${user}" \
+		"${file_path}"
+
+	chmod \
+		0660 \
+		"${file_path}"
+}
+
 function set_wrapper_execute_user ()
 {
 	local file_path="${1:-}"
 	local user="${2:-}"
 
 	chgrp \
-		"${USER}" \
-		"${WRAPPER}"
+		"${user}" \
+		"${file_path}"
 
 	chmod \
 		0750 \
-		"${WRAPPER}"
+		"${file_path}"
 }
 
-load_config \
-	"${CONFIG_PATH}"
-
 set_wrapper_execute_user \
 	"${WRAPPER}" \
 	"${USER}"
 
-# Force a longer execution time to allow output in logs
-sleep 0.05
+set_log_write_user \
+	"${LOG_FILE}" \
+	"${USER}"
+
+load_config \
+	"${CONFIG_PATH}"
 
 TIMER_TOTAL="$(
 	echo - | awk "\