From 345785837f1caa01fec5bca091c70481d7069bea Mon Sep 17 00:00:00 2001 From: Charles Hsu Date: Thu, 30 Jul 2015 13:11:00 +0800 Subject: [PATCH] Remove error_suppression_interval, error_suppression_limit options. These two options is belong to proxy-server, not account-replicator. Change-Id: Ie030ecffd213e56db32df77c69b847479d96308f --- doc/manpages/account-server.conf.5 | 6 ------ etc/account-server.conf-sample | 7 ------- 2 files changed, 13 deletions(-) diff --git a/doc/manpages/account-server.conf.5 b/doc/manpages/account-server.conf.5 index b60baeb60d..cec0752999 100644 --- a/doc/manpages/account-server.conf.5 +++ b/doc/manpages/account-server.conf.5 @@ -188,12 +188,6 @@ Number of replication workers to spawn. The default is 8. Time in seconds to wait between replication passes. The default is 30. .IP \fBinterval\fR Replaces run_pause with the more standard "interval", which means the replicator won't pause unless it takes less than the interval set. The default is 30. -.IP \fBerror_suppression_interval\fR -How long without an error before a node's error count is reset. This will also be how long before a node is re-enabled after suppression is triggered. -The default is 60 seconds. -.IP \fBerror_suppression_limit\fR -How many errors can accumulate before a node is temporarily ignored. The default -is 10 seconds. .IP \fBnode_timeout\fR Request timeout to external services. The default is 10 seconds. .IP \fBconn_timeout\fR diff --git a/etc/account-server.conf-sample b/etc/account-server.conf-sample index 3631986fa2..8cfbfa0098 100644 --- a/etc/account-server.conf-sample +++ b/etc/account-server.conf-sample @@ -100,13 +100,6 @@ use = egg:swift#recon # run_pause is deprecated, use interval instead # run_pause = 30 # -# How long without an error before a node's error count is reset. This will -# also be how long before a node is reenabled after suppression is triggered. -# error_suppression_interval = 60 -# -# How many errors can accumulate before a node is temporarily ignored. -# error_suppression_limit = 10 -# # node_timeout = 10 # conn_timeout = 0.5 #