Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

embed: add 'enable-pprof' tag for config file

Browse Source 
Fix https://github.com/coreos/etcd/issues/8402.

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyu-Ho Lee 2017-08-15 11:22:10 -07:00
parent e197c14847
commit fa0f278783
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embed/config.go
View File

@ -109,7 +109,7 @@ type Config struct {
Debug bool `json:"debug"` Debug bool `json:"debug"`
LogPkgLevels string `json:"log-package-levels"` LogPkgLevels string `json:"log-package-levels"`
EnablePprof bool EnablePprof bool `json:"enable-pprof"`
Metrics string `json:"metrics"` Metrics string `json:"metrics"`
// ForceNewCluster starts a new cluster even if previously started; unsafe. // ForceNewCluster starts a new cluster even if previously started; unsafe.

31
etcd.conf.yml.sample
View File

@ -35,7 +35,7 @@ max-snapshots: 5
max-wals: 5 max-wals: 5
# Comma-separated white list of origins for CORS (cross-origin resource sharing). # Comma-separated white list of origins for CORS (cross-origin resource sharing).
cors: cors:
# List of this member's peer URLs to advertise to the rest of the cluster. # List of this member's peer URLs to advertise to the rest of the cluster.
# The URLs needed to be a comma-separated list. # The URLs needed to be a comma-separated list.
@ -46,16 +46,16 @@ initial-advertise-peer-urls: http://localhost:2380
advertise-client-urls: http://localhost:2379 advertise-client-urls: http://localhost:2379
# Discovery URL used to bootstrap the cluster. # Discovery URL used to bootstrap the cluster.
discovery: discovery:
# Valid values include 'exit', 'proxy' # Valid values include 'exit', 'proxy'
discovery-fallback: 'proxy' discovery-fallback: 'proxy'
# HTTP proxy to use for traffic to discovery service. # HTTP proxy to use for traffic to discovery service.
discovery-proxy: discovery-proxy:
# DNS domain used to bootstrap initial cluster. # DNS domain used to bootstrap initial cluster.
discovery-srv: discovery-srv:
# Initial cluster configuration for bootstrapping. # Initial cluster configuration for bootstrapping.
initial-cluster: initial-cluster:
@ -72,6 +72,9 @@ strict-reconfig-check: false
# Accept etcd V2 client requests # Accept etcd V2 client requests
enable-v2: true enable-v2: true
# Enable runtime profiling data via HTTP server
enable-pprof: true
# Valid values include 'on', 'readonly', 'off' # Valid values include 'on', 'readonly', 'off'
proxy: 'off' proxy: 'off'
@ -90,40 +93,40 @@ proxy-write-timeout: 5000
# Time (in milliseconds) for a read to timeout. # Time (in milliseconds) for a read to timeout.
proxy-read-timeout: 0 proxy-read-timeout: 0
client-transport-security: client-transport-security:
# DEPRECATED: Path to the client server TLS CA file. # DEPRECATED: Path to the client server TLS CA file.
ca-file: ca-file:
# Path to the client server TLS cert file. # Path to the client server TLS cert file.
cert-file: cert-file:
# Path to the client server TLS key file. # Path to the client server TLS key file.
key-file: key-file:
# Enable client cert authentication. # Enable client cert authentication.
client-cert-auth: false client-cert-auth: false
# Path to the client server TLS trusted CA key file. # Path to the client server TLS trusted CA key file.
trusted-ca-file: trusted-ca-file:
# Client TLS using generated certificates # Client TLS using generated certificates
auto-tls: false auto-tls: false
peer-transport-security: peer-transport-security:
# DEPRECATED: Path to the peer server TLS CA file. # DEPRECATED: Path to the peer server TLS CA file.
ca-file: ca-file:
# Path to the peer server TLS cert file. # Path to the peer server TLS cert file.
cert-file: cert-file:
# Path to the peer server TLS key file. # Path to the peer server TLS key file.
key-file: key-file:
# Enable peer client cert authentication. # Enable peer client cert authentication.
client-cert-auth: false client-cert-auth: false
# Path to the peer server TLS trusted CA key file. # Path to the peer server TLS trusted CA key file.
trusted-ca-file: trusted-ca-file:
# Peer TLS using generated certificates. # Peer TLS using generated certificates.
auto-tls: false auto-tls: false
@ -132,7 +135,7 @@ peer-transport-security:
debug: false debug: false
# Specify a particular log level for each etcd package (eg: 'etcdmain=CRITICAL,etcdserver=DEBUG'. # Specify a particular log level for each etcd package (eg: 'etcdmain=CRITICAL,etcdserver=DEBUG'.
log-package-levels: log-package-levels:
# Force to create a new one member cluster. # Force to create a new one member cluster.
force-new-cluster: false force-new-cluster: false