misc: trim trailing spaces

admin/codis-dashboard-admin.sh

@@ -29,12 +29,12 @@ start)
     echo  "starting codis-dashboard ... "
     if [ -f "$CODIS_DASHBOARD_PID_FILE" ]; then
       if kill -0 `cat "$CODIS_DASHBOARD_PID_FILE"` > /dev/null 2>&1; then
-         echo $command already running as process `cat "$CODIS_DASHBOARD_PID_FILE"`. 
+         echo $command already running as process `cat "$CODIS_DASHBOARD_PID_FILE"`.
          exit 0
       fi
     fi
     nohup "$CODIS_DASHBOARD_BIN" "--config=${CODIS_DASHBOARD_CONF_FILE}" \
-    "--log=$CODIS_DASHBOARD_LOG_FILE" "--log-level=INFO" "--pidfile=$CODIS_DASHBOARD_PID_FILE" > "$CODIS_DASHBOARD_DAEMON_FILE" 2>&1 < /dev/null & 
+    "--log=$CODIS_DASHBOARD_LOG_FILE" "--log-level=INFO" "--pidfile=$CODIS_DASHBOARD_PID_FILE" > "$CODIS_DASHBOARD_DAEMON_FILE" 2>&1 < /dev/null &
     ;;
 start-foreground)
     $CODIS_DASHBOARD_BIN "--config=${CODIS_DASHBOARD_CONF_FILE}" \

admin/codis-fe-admin.sh

@@ -31,12 +31,12 @@ start)
     echo  "starting codis-fe ... "
     if [ -f "$CODIS_FE_PID_FILE" ]; then
       if kill -0 `cat "$CODIS_FE_PID_FILE"` > /dev/null 2>&1; then
-         echo $command already running as process `cat "$CODIS_FE_PID_FILE"`. 
+         echo $command already running as process `cat "$CODIS_FE_PID_FILE"`.
          exit 0
       fi
     fi
     nohup "$CODIS_FE_BIN" "--assets-dir=${CODIS_FE_ASSETS_DIR}" "--$COORDINATOR_NAME=$COORDINATOR_ADDR" \
-    "--log=$CODIS_FE_LOG_FILE" "--pidfile=$CODIS_FE_PID_FILE" "--log-level=INFO" "--listen=$CODIS_FE_ADDR" > "$CODIS_FE_DAEMON_FILE" 2>&1 < /dev/null & 
+    "--log=$CODIS_FE_LOG_FILE" "--pidfile=$CODIS_FE_PID_FILE" "--log-level=INFO" "--listen=$CODIS_FE_ADDR" > "$CODIS_FE_DAEMON_FILE" 2>&1 < /dev/null &
     ;;
 start-foreground)
     $CODIS_FE_BIN "--assets-dir=${CODIS_FE_ASSETS_DIR}" "--$COORDINATOR_NAME=$COORDINATOR_ADDR" \

admin/codis-proxy-admin.sh

@@ -30,12 +30,12 @@ start)
     echo  "starting codis-proxy ... "
     if [ -f "$CODIS_PROXY_PID_FILE" ]; then
       if kill -0 `cat "$CODIS_PROXY_PID_FILE"` > /dev/null 2>&1; then
-         echo $command already running as process `cat "$CODIS_PROXY_PID_FILE"`. 
+         echo $command already running as process `cat "$CODIS_PROXY_PID_FILE"`.
          exit 0
       fi
     fi
     nohup "$CODIS_PROXY_BIN" "--config=${CODIS_PROXY_CONF_FILE}" "--dashboard=${CODIS_DASHBOARD_ADDR}" \
-    "--log=$CODIS_PROXY_LOG_FILE" "--log-level=INFO" "--ncpu=4" "--pidfile=$CODIS_PROXY_PID_FILE" > "$CODIS_PROXY_DAEMON_FILE" 2>&1 < /dev/null & 
+    "--log=$CODIS_PROXY_LOG_FILE" "--log-level=INFO" "--ncpu=4" "--pidfile=$CODIS_PROXY_PID_FILE" > "$CODIS_PROXY_DAEMON_FILE" 2>&1 < /dev/null &
     ;;
 start-foreground)
     $CODIS_PROXY_BIN "--config=${CODIS_PROXY_CONF_FILE}" "--dashboard=${CODIS_DASHBOARD_ADDR}" \

admin/codis-server-admin.sh

@@ -28,11 +28,11 @@ start)
     echo  "starting codis-server ... "
     if [ -f "$CODIS_SERVER_PID_FILE" ]; then
       if kill -0 `cat "$CODIS_SERVER_PID_FILE"` > /dev/null 2>&1; then
-         echo $command already running as process `cat "$CODIS_SERVER_PID_FILE"`. 
+         echo $command already running as process `cat "$CODIS_SERVER_PID_FILE"`.
          exit 0
       fi
     fi
-    nohup "$CODIS_SERVER_BIN" "${CODIS_SERVER_CONF_FILE}" > "$CODIS_SERVER_DAEMON_FILE" 2>&1 < /dev/null & 
+    nohup "$CODIS_SERVER_BIN" "${CODIS_SERVER_CONF_FILE}" > "$CODIS_SERVER_DAEMON_FILE" 2>&1 < /dev/null &
     ;;
 stop)
     echo "stopping codis-server ... "

ansible/group_vars/all

@@ -1,5 +1,5 @@
 ---
-codis_dir: /home/codis/codis 
+codis_dir: /home/codis/codis
 
 coordinator_name: filesystem
 

ansible/roles/codis-dashboard/tasks/main.yml

@@ -2,14 +2,14 @@
 - name: Copy codis-admin binary
   copy: src={{ codis_dir }}/bin/codis-admin dest={{ codis_install_dir }}/bin/codis-admin mode=766
 
-- name: Copy codis-dashboard binary 
+- name: Copy codis-dashboard binary
   copy: src={{ codis_dir }}/bin/codis-dashboard dest={{ codis_install_dir }}/bin/codis-dashboard mode=766
 
 - name: Copy codis-dashboard configuration
   template: src=dashboard.toml dest={{ codis_install_dir }}/config/dashboard.toml
 
-- name: Copy codis-dashboard admin script 
+- name: Copy codis-dashboard admin script
   template: src=codis-dashboard-admin.sh dest={{ codis_install_dir }}/admin/codis-dashboard-admin.sh mode=766
 
-- name: Restart codis-dashboard service 
+- name: Restart codis-dashboard service
   command: "{{ codis_install_dir }}/admin/codis-dashboard-admin.sh restart"

ansible/roles/codis-dashboard/templates/codis-dashboard-admin.sh

@@ -29,12 +29,12 @@ start)
     echo  "starting codis-dashboard ... "
     if [ -f "$CODIS_DASHBOARD_PID_FILE" ]; then
       if kill -0 `cat "$CODIS_DASHBOARD_PID_FILE"` > /dev/null 2>&1; then
-         echo $command already running as process `cat "$CODIS_DASHBOARD_PID_FILE"`. 
+         echo $command already running as process `cat "$CODIS_DASHBOARD_PID_FILE"`.
          exit 0
       fi
     fi
     nohup "$CODIS_DASHBOARD_BIN" "--config=${CODIS_DASHBOARD_CONF_FILE}" \
-    "--log=$CODIS_DASHBOARD_LOG_FILE" "--log-level=INFO" "--pidfile=$CODIS_DASHBOARD_PID_FILE" > "$CODIS_DASHBOARD_DAEMON_FILE" 2>&1 < /dev/null & 
+    "--log=$CODIS_DASHBOARD_LOG_FILE" "--log-level=INFO" "--pidfile=$CODIS_DASHBOARD_PID_FILE" > "$CODIS_DASHBOARD_DAEMON_FILE" 2>&1 < /dev/null &
     ;;
 start-foreground)
     $CODIS_DASHBOARD_BIN "--config=${CODIS_DASHBOARD_CONF_FILE}" \

ansible/roles/codis-dashboard/templates/dashboard.toml

@@ -17,7 +17,7 @@ product_name = "{{ product_name }}"
 product_auth = "{{ product_auth }}"
 
 # Set bind address for admin(rpc), tcp only.
-admin_addr = "{{ dashboard_addr }}" 
+admin_addr = "{{ dashboard_addr }}"
 
 # Set arguments for data migration (only accept 'sync' & 'semi-async').
 migration_method = "semi-async"

ansible/roles/codis-fe/tasks/main.yml

@@ -1,12 +1,12 @@
 ---
-- name: Copy codis-fe binary 
+- name: Copy codis-fe binary
   copy: src={{ codis_dir }}/bin/codis-fe dest={{ codis_install_dir }}/bin/codis-fe mode=766
 
-- name: Copy codis-fe assets 
+- name: Copy codis-fe assets
   command: cp -r {{ codis_dir }}/bin/assets {{ codis_install_dir }}/bin
 
-- name: Copy codis-fe admin script 
+- name: Copy codis-fe admin script
   template: src=codis-fe-admin.sh dest={{ codis_install_dir }}/admin/codis-fe-admin.sh mode=766
 
-- name: Restart codis-fe service 
+- name: Restart codis-fe service
   command: "{{ codis_install_dir }}/admin/codis-fe-admin.sh restart"

ansible/roles/codis-fe/templates/codis-fe-admin.sh

@@ -31,12 +31,12 @@ start)
     echo  "starting codis-fe ... "
     if [ -f "$CODIS_FE_PID_FILE" ]; then
       if kill -0 `cat "$CODIS_FE_PID_FILE"` > /dev/null 2>&1; then
-         echo $command already running as process `cat "$CODIS_FE_PID_FILE"`. 
+         echo $command already running as process `cat "$CODIS_FE_PID_FILE"`.
          exit 0
       fi
     fi
     nohup "$CODIS_FE_BIN" "--assets-dir=${CODIS_FE_ASSETS_DIR}" "--$COORDINATOR_NAME=$COORDINATOR_ADDR" \
-    "--log=$CODIS_FE_LOG_FILE" "--pidfile=$CODIS_FE_PID_FILE" "--log-level=INFO" "--listen=$CODIS_FE_ADDR" > "$CODIS_FE_DAEMON_FILE" 2>&1 < /dev/null & 
+    "--log=$CODIS_FE_LOG_FILE" "--pidfile=$CODIS_FE_PID_FILE" "--log-level=INFO" "--listen=$CODIS_FE_ADDR" > "$CODIS_FE_DAEMON_FILE" 2>&1 < /dev/null &
     ;;
 start-foreground)
     $CODIS_FE_BIN "--assets-dir=${CODIS_FE_ASSETS_DIR}" "--$COORDINATOR_NAME=$COORDINATOR_ADDR" \

ansible/roles/codis-proxy/tasks/main.yml

@@ -1,12 +1,12 @@
 ---
-- name: Copy codis-proxy binary 
+- name: Copy codis-proxy binary
   copy: src={{ codis_dir }}/bin/codis-proxy dest={{ codis_install_dir }}/bin/codis-proxy mode=766
 
 - name: Copy codis-proxy configuration
   template: src=proxy.toml dest={{ codis_install_dir }}/config/proxy.toml
 
-- name: Copy codis-proxy admin script 
+- name: Copy codis-proxy admin script
   template: src=codis-proxy-admin.sh dest={{ codis_install_dir }}/admin/codis-proxy-admin.sh mode=766
 
-- name: Restart codis-proxy service 
+- name: Restart codis-proxy service
   command: "{{ codis_install_dir }}/admin/codis-proxy-admin.sh restart"

ansible/roles/codis-proxy/templates/codis-proxy-admin.sh

@@ -30,12 +30,12 @@ start)
     echo  "starting codis-proxy ... "
     if [ -f "$CODIS_PROXY_PID_FILE" ]; then
       if kill -0 `cat "$CODIS_PROXY_PID_FILE"` > /dev/null 2>&1; then
-         echo $command already running as process `cat "$CODIS_PROXY_PID_FILE"`. 
+         echo $command already running as process `cat "$CODIS_PROXY_PID_FILE"`.
          exit 0
       fi
     fi
     nohup "$CODIS_PROXY_BIN" "--config=${CODIS_PROXY_CONF_FILE}" "--dashboard=${CODIS_DASHBOARD_ADDR}" \
-    "--log=$CODIS_PROXY_LOG_FILE" "--log-level=INFO" "--ncpu=4" "--pidfile=$CODIS_PROXY_PID_FILE" > "$CODIS_PROXY_DAEMON_FILE" 2>&1 < /dev/null & 
+    "--log=$CODIS_PROXY_LOG_FILE" "--log-level=INFO" "--ncpu=4" "--pidfile=$CODIS_PROXY_PID_FILE" > "$CODIS_PROXY_DAEMON_FILE" 2>&1 < /dev/null &
     ;;
 start-foreground)
     $CODIS_PROXY_BIN "--config=${CODIS_PROXY_CONF_FILE}" "--dashboard=${CODIS_DASHBOARD_ADDR}" \

ansible/roles/codis-server/tasks/main.yml

@@ -2,14 +2,14 @@
 - name: Create codis server work directory
   file: path={{ codis_server_workdir }} state=directory owner=codis group=codis
 
-- name: Copy codis-server binary 
+- name: Copy codis-server binary
   copy: src={{ codis_dir }}/bin/codis-server dest={{ codis_install_dir }}/bin/codis-server mode=766
 
 - name: Copy codis-server configuration
   template: src=redis.conf dest={{ codis_install_dir }}/config/redis.conf
 
-- name: Copy codis-server admin script 
+- name: Copy codis-server admin script
   template: src=codis-server-admin.sh dest={{ codis_install_dir }}/admin/codis-server-admin.sh mode=766
 
-- name: Restart codis-server service 
+- name: Restart codis-server service
   command: "{{ codis_install_dir }}/admin/codis-server-admin.sh restart"

ansible/roles/codis-server/templates/codis-server-admin.sh

@@ -28,11 +28,11 @@ start)
     echo  "starting codis-server ... "
     if [ -f "$CODIS_SERVER_PID_FILE" ]; then
       if kill -0 `cat "$CODIS_SERVER_PID_FILE"` > /dev/null 2>&1; then
-         echo $command already running as process `cat "$CODIS_SERVER_PID_FILE"`. 
+         echo $command already running as process `cat "$CODIS_SERVER_PID_FILE"`.
          exit 0
       fi
     fi
-    nohup "$CODIS_SERVER_BIN" "${CODIS_SERVER_CONF_FILE}" > "$CODIS_SERVER_DAEMON_FILE" 2>&1 < /dev/null & 
+    nohup "$CODIS_SERVER_BIN" "${CODIS_SERVER_CONF_FILE}" > "$CODIS_SERVER_DAEMON_FILE" 2>&1 < /dev/null &
     ;;
 stop)
     echo "stopping codis-server ... "

ansible/roles/codis-server/templates/redis.conf

@@ -81,7 +81,7 @@ protected-mode yes
 
 # Accept connections on the specified port, default is 6379 (IANA #815344).
 # If port 0 is specified Redis will not listen on a TCP socket.
-port {{ codis_server_port }} 
+port {{ codis_server_port }}
 
 # TCP listen() backlog.
 #
@@ -244,7 +244,7 @@ dbfilename dump.rdb
 # The Append Only File will also be created inside this directory.
 #
 # Note that you must specify a directory here, not a file name.
-dir {{ codis_server_workdir }} 
+dir {{ codis_server_workdir }}
 
 ################################# REPLICATION #################################
 
@@ -269,7 +269,7 @@ dir {{ codis_server_workdir }}
 # starting the replication synchronization process, otherwise the master will
 # refuse the slave request.
 #
-masterauth {{ product_auth }} 
+masterauth {{ product_auth }}
 
 # When a slave loses its connection with the master, or when the replication
 # is still in progress, the slave can act in two different ways:
@@ -477,7 +477,7 @@ slave-priority 100
 # 150k passwords per second against a good box. This means that you should
 # use a very strong password otherwise it will be very easy to break.
 #
-requirepass {{ product_auth }} 
+requirepass {{ product_auth }}
 
 # Command renaming.
 #

ansible/roles/redis-sentinel/tasks/main.yml

@@ -2,14 +2,14 @@
 - name: Create redis sentinel work directory
   file: path={{ redis_sentinel_workdir }} state=directory owner=codis group=codis
 
-- name: Copy redis-sentinel binary 
+- name: Copy redis-sentinel binary
   copy: src={{ codis_dir }}/bin/codis-server dest={{ codis_install_dir }}/bin/redis-sentinel mode=766
 
 - name: Copy redis-sentinel configuration
   template: src=sentinel.conf dest={{ codis_install_dir }}/config/sentinel.conf
 
-- name: Copy redis-sentinel admin script 
+- name: Copy redis-sentinel admin script
   template: src=redis-sentinel-admin.sh dest={{ codis_install_dir }}/admin/redis-sentinel-admin.sh mode=766
 
-- name: Restart redis-sentinel service 
+- name: Restart redis-sentinel service
   command: "{{ codis_install_dir }}/admin/redis-sentinel-admin.sh restart"

ansible/roles/redis-sentinel/templates/redis-sentinel-admin.sh

@@ -28,11 +28,11 @@ start)
     echo  "starting redis-sentinel ... "
     if [ -f "$REDIS_SENTINEL_PID_FILE" ]; then
       if kill -0 `cat "$REDIS_SENTINEL_PID_FILE"` > /dev/null 2>&1; then
-         echo $command already running as process `cat "$REDIS_SENTINEL_PID_FILE"`. 
+         echo $command already running as process `cat "$REDIS_SENTINEL_PID_FILE"`.
          exit 0
       fi
     fi
-    nohup "$REDIS_SENTINEL_BIN" "${REDIS_SENTINEL_CONF_FILE}" > "$REDIS_SENTINEL_DAEMON_FILE" 2>&1 < /dev/null & 
+    nohup "$REDIS_SENTINEL_BIN" "${REDIS_SENTINEL_CONF_FILE}" > "$REDIS_SENTINEL_DAEMON_FILE" 2>&1 < /dev/null &
     ;;
 stop)
     echo "stopping redis-sentinel ... "

ansible/roles/redis-sentinel/templates/sentinel.conf

@@ -18,7 +18,7 @@
 
 # port <sentinel-port>
 # The port that this sentinel instance will run on
-port {{ redis_sentinel_port }} 
+port {{ redis_sentinel_port }}
 
 daemonize yes
 
@@ -52,7 +52,7 @@ pidfile "{{ redis_sentinel_workdir }}/sentinel_{{ redis_sentinel_port }}.pid"
 # For Redis Sentinel to chdir to /tmp at startup is the simplest thing
 # for the process to don't interfere with administrative tasks such as
 # unmounting filesystems.
-dir {{ redis_sentinel_workdir }} 
+dir {{ redis_sentinel_workdir }}
 
 # sentinel monitor <master-name> <ip> <redis-port> <quorum>
 #
@@ -157,7 +157,7 @@ dir {{ redis_sentinel_workdir }}
 # NOTIFICATION SCRIPT
 #
 # sentinel notification-script <master-name> <script-path>
-# 
+#
 # Call the specified notification script for any sentinel event that is
 # generated in the WARNING level (for instance -sdown, -odown, and so forth).
 # This script should notify the system administrator via email, SMS, or any
@@ -181,14 +181,14 @@ dir {{ redis_sentinel_workdir }}
 # When the master changed because of a failover a script can be called in
 # order to perform application-specific tasks to notify the clients that the
 # configuration has changed and the master is at a different address.
-# 
+#
 # The following arguments are passed to the script:
 #
 # <master-name> <role> <state> <from-ip> <from-port> <to-ip> <to-port>
 #
 # <state> is currently always "failover"
 # <role> is either "leader" or "observer"
-# 
+#
 # The arguments from-ip, from-port, to-ip, to-port are used to communicate
 # the old address of the master and the new address of the elected slave
 # (now a master).

ansible/site.yml

@@ -1,27 +1,27 @@
 ---
-- name: codis environment init 
-  hosts: all 
+- name: codis environment init
+  hosts: all
   remote_user: codis
   roles:
-    - common 
+    - common
 
 - name: Install codis-dashboard
   hosts: codis-dashboard-servers
   remote_user: codis
   roles:
-    - codis-dashboard 
+    - codis-dashboard
 
 - name: Install codis-proxy
   hosts: codis-proxy-servers
   remote_user: codis
   roles:
-    - codis-proxy 
+    - codis-proxy
 
 - name: Install codis-server
   hosts: codis-servers
   remote_user: codis
   roles:
-    - codis-server 
+    - codis-server
 
 - name: Install redis-sentinel
   hosts: redis-sentinel-servers
@@ -33,4 +33,4 @@
   hosts: codis-fe-servers
   remote_user: codis
   roles:
-    - codis-fe 
+    - codis-fe