scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 10:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't connect to hosts twice when creating remote cluster

Browse source
This commit is contained in:
jaffee 2017-01-13 14:52:42 -06:00
parent a02b8a5854
commit 7533ca4ab1
3 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/pilosactl/main.go
View file

@ -1534,7 +1534,7 @@ func (cmd *BspawnCommand) Run(ctx context.Context) error {
}
func (cmd *BspawnCommand) spawnRemote(ctx context.Context) (map[string]interface{}, error) {
agentIndex := 0
agentIdx := 0
agentFleet, err := pssh.NewFleet(cmd.AgentHosts, cmd.SSHUser, "", cmd.Stderr)
if err != nil {
return nil, err
@ -1560,10 +1560,12 @@ func (cmd *BspawnCommand) spawnRemote(ctx context.Context) (map[string]interface
for _, sp := range cmd.Benchmarks {
results[sp.Name] = make(map[int]interface{})
for i := 0; i < sp.Num; i++ {
sess, err := agentFleet[agentIndex].NewSession()
agentIdx %= len(cmd.AgentHosts)
sess, err := agentFleet[cmd.AgentHosts[agentIdx]].NewSession()
if err != nil {
return nil, err
}
agentIdx += 1
sessions = append(sessions, sess)
stdout, err := sess.StdoutPipe()
if err != nil {

12
creator/remote.go
View file

@ -44,11 +44,11 @@ func (c *RemoteCluster) Start() error {
return fmt.Errorf("no type or hosts specified - cannot continue")
}
fleet, err := pssh.NewFleet(c.ClusterHosts, c.SSHUser, c.Keyfile, c.Stderr)
if err != nil {
return fmt.Errorf("connecting to cluster hosts: %v", err)
}
if c.CopyBinary {
fleet, err := pssh.NewFleet(c.ClusterHosts, c.SSHUser, c.Keyfile, c.Stderr)
if err != nil {
return fmt.Errorf("copying binary: %v", err)
}
pkg := "github.com/pilosa/pilosa/cmd/pilosa"
bin, err := build.Binary(pkg, c.GOOS, c.GOARCH)
@ -79,8 +79,8 @@ func (c *RemoteCluster) Start() error {
conf.Host = hostport
conf.DataDir = "~/.pilosa" + port
// Connect to remote host
client, err := pssh.NewClient(host, c.SSHUser, "", c.Stderr)
// Get client for host
client, err := fleet.Get(host)
if err != nil {
return fmt.Errorf("connecting to host: %v", err)
}

19
ssh/ssh.go
View file

@ -68,17 +68,17 @@ func NewClient(host, username, keyfile string, stderr io.Writer) (*Client, error
return &Client{client: client, Stderr: stderr}, nil
}
type Fleet []*Client
type Fleet map[string]*Client
func NewFleet(hosts []string, username, keyfile string, stderr io.Writer) (Fleet, error) {
hosts = DedupHosts(hosts)
clients := make([]*Client, len(hosts))
for i, host := range hosts {
clients := make(map[string]*Client, len(hosts))
for _, host := range hosts {
client, err := NewClient(host, username, keyfile, stderr)
if err != nil {
return nil, err
}
clients[i] = client
clients[host] = client
}
return clients, nil
}
@ -212,3 +212,14 @@ func (sf Fleet) WriteFile(name, perm string, data io.Reader) error {
}
return wc.Close()
}
func (sf Fleet) Get(host string) (*Client, error) {
colonIdx := strings.Index(host, ":")
if colonIdx != -1 {
host = host[:colonIdx]
}
if client, ok := sf[host]; ok {
return client, nil
}
return nil, fmt.Errorf("No client found in fleet: %v for host: %v", sf, host)
}