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

etcd-agent: remove "use-root"

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-01-02 08:52:20 -08:00
parent 8bba5367f0
commit affcaef868
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/functional-tester/etcd-agent/agent.go
View File

@ -46,7 +46,6 @@ type AgentConfig struct {
EtcdPath string
LogDir string
FailpointAddr string
UseRoot bool
}
func newAgent(cfg AgentConfig) (*Agent, error) {
@ -178,23 +177,14 @@ func (a *Agent) terminate() error {
}
func (a *Agent) dropPort(port int) error {
if !a.cfg.UseRoot {
return nil
}
return netutil.DropPort(port)
}
func (a *Agent) recoverPort(port int) error {
if !a.cfg.UseRoot {
return nil
}
return netutil.RecoverPort(port)
}
func (a *Agent) setLatency(ms, rv int) error {
if !a.cfg.UseRoot {
return nil
}
if ms == 0 {
return netutil.RemoveLatency()
}

12
tools/functional-tester/etcd-agent/main.go
View File

@ -16,7 +16,6 @@ package main
import (
"flag"
"fmt"
"os"
"path/filepath"
@ -29,7 +28,6 @@ func main() {
etcdPath := flag.String("etcd-path", filepath.Join(os.Getenv("GOPATH"), "bin/etcd"), "the path to etcd binary")
etcdLogDir := flag.String("etcd-log-dir", "etcd-log", "directory to store etcd logs, data directories, failure archive")
port := flag.String("port", ":9027", "port to serve agent server")
useRoot := flag.Bool("use-root", true, "use root permissions")
failpointAddr := flag.String("failpoint-addr", ":2381", "interface for gofail's HTTP server")
flag.Parse()
@ -37,17 +35,7 @@ func main() {
EtcdPath: *etcdPath,
LogDir: *etcdLogDir,
FailpointAddr: *failpointAddr,
UseRoot: *useRoot,
}
if *useRoot && os.Getuid() != 0 {
fmt.Println("got --use-root=true but not root user")
os.Exit(1)
}
if !*useRoot {
fmt.Println("root permissions disabled, agent will not modify network")
}
a, err := newAgent(cfg)
if err != nil {
plog.Fatal(err)