deploy: update templates, set session_break_on_failure = false

spinlock · spinlock · commit 365c91137d46 · 2016-12-08T13:48:01.000+08:00
diff --git a/deploy/root/opt/codis/etc/10.2.16.200_19000/proxy.toml b/deploy/root/opt/codis/etc/10.2.16.200_19000/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 512
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/10.2.16.200_19002/proxy.toml b/deploy/root/opt/codis/etc/10.2.16.200_19002/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 512
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/10.2.16.201_19000/proxy.toml b/deploy/root/opt/codis/etc/10.2.16.201_19000/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 512
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/10.2.16.201_19002/proxy.toml b/deploy/root/opt/codis/etc/10.2.16.201_19002/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 512
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/10.2.16.202_19000/proxy.toml b/deploy/root/opt/codis/etc/10.2.16.202_19000/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 512
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/10.2.16.202_19002/proxy.toml b/deploy/root/opt/codis/etc/10.2.16.202_19002/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 512
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/10.4.10.100_18080/dashboard.toml b/deploy/root/opt/codis/etc/10.4.10.100_18080/dashboard.toml
@@ -20,4 +20,6 @@ sentinel_quorum = 2
 sentinel_parallel_syncs = 1
 sentinel_down_after = "10s"
 sentinel_failover_timeout = "5m"
+sentinel_notification_script = ""
+sentinel_client_reconfig_script = ""
 
diff --git a/deploy/root/opt/codis/etc/10.4.10.200_19000/proxy.toml b/deploy/root/opt/codis/etc/10.4.10.200_19000/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 512
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/10.4.10.200_19002/proxy.toml b/deploy/root/opt/codis/etc/10.4.10.200_19002/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 512
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/10.4.10.201_19000/proxy.toml b/deploy/root/opt/codis/etc/10.4.10.201_19000/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 512
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/10.4.10.201_19002/proxy.toml b/deploy/root/opt/codis/etc/10.4.10.201_19002/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 512
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/127.0.0.1_18080/dashboard.toml b/deploy/root/opt/codis/etc/127.0.0.1_18080/dashboard.toml
@@ -20,4 +20,6 @@ sentinel_quorum = 2
 sentinel_parallel_syncs = 1
 sentinel_down_after = "10s"
 sentinel_failover_timeout = "5m"
+sentinel_notification_script = ""
+sentinel_client_reconfig_script = ""
 
diff --git a/deploy/root/opt/codis/etc/127.0.0.1_19000/proxy.toml b/deploy/root/opt/codis/etc/127.0.0.1_19000/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 1024
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/127.0.0.1_19001/proxy.toml b/deploy/root/opt/codis/etc/127.0.0.1_19001/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 1024
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/root/opt/codis/etc/127.0.0.1_19002/proxy.toml b/deploy/root/opt/codis/etc/127.0.0.1_19002/proxy.toml
@@ -73,6 +73,9 @@ session_max_pipeline = 1024
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/deploy/templates/dashboard.toml.template b/deploy/templates/dashboard.toml.template
@@ -20,4 +20,6 @@ sentinel_quorum = {SENTINEL_QUORUM}
 sentinel_parallel_syncs = 1
 sentinel_down_after = "{SENTINEL_DOWN_AFTER}"
 sentinel_failover_timeout = "5m"
+sentinel_notification_script = ""
+sentinel_client_reconfig_script = ""
 
diff --git a/deploy/templates/proxy.toml.template b/deploy/templates/proxy.toml.template
@@ -73,6 +73,9 @@ session_max_pipeline = {MAX_PIPELINE}
 # Set session tcp keepalive period. (0 to disable)
 session_keepalive_period = "75s"
 
+# Set session to be sensitive to failures. Default is false, instead of closing socket, proxy will send an error response to client.
+session_break_on_failure = false
+
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
 metrics_report_period = "1s"
diff --git a/example/proxy.py b/example/proxy.py
@@ -39,6 +39,7 @@ def _open_config(admin_port, proxy_port, product_name, product_auth=None):
             f.write('proxy_datacenter = "localhost"\n')
             f.write('proxy_heap_placeholder = "0"\n')
             f.write('proxy_max_offheap_size = "0"\n')
+            f.write('session_break_on_failure = false\n')
         return config
 
 
