scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-06 00:25:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor/cleanup remote file creation

Browse source
This commit is contained in:
jaffee 2016-12-22 09:23:55 -06:00
parent bc9fbe450d
commit 73c0ea2f0c
3 changed files with 46 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/pilosactl/multidbspawn.json
View file

@ -1,5 +1,5 @@
{
"CreatorArgs": ["-type", "local", "-serverN", "3", "-replicaN", "1", "-log-file-prefix", "multidblog"],
"CreatorArgs": ["-hosts", "localhost:19444,localhost:19445,localhost:19446", "-log-file-prefix", "multidblog"],
"AgentHosts": ["localhost"],
"Benchmarks": [
{

19
creator/remote.go
View file

@ -57,21 +57,14 @@ func (c *RemoteCluster) Start() error {
conf.DataDir = "~/.pilosa" + port
// Connect to remote host
client, err := pilosactl.NewSSH(host, c.SSHUser, "")
if err != nil {
return err
}
// Create config file on remote host
sess, err := client.NewSession()
client, err := pilosactl.NewSSH(host, c.SSHUser, "", c.Stderr)
if err != nil {
return err
}
configname := "pilosa" + port + ".conf"
w, err := sess.StdinPipe()
err = sess.Start("cat > " + configname)
w, err := client.OpenFile(configname)
if err != nil {
return err
return fmt.Errorf("opening remote config file: %v", err)
}
enc := toml.NewEncoder(w)
err = enc.Encode(conf)
@ -82,13 +75,9 @@ func (c *RemoteCluster) Start() error {
if err != nil {
return err
}
err = sess.Wait()
if err != nil {
return err
}
// Start pilosa on remote host
sess, err = client.NewSession()
sess, err := client.NewSession()
if err != nil {
return err
}

45
pilosactl/ssh.go
View file

@ -2,6 +2,7 @@ package pilosactl
import (
"fmt"
"io"
"net"
"os"
"os/user"
@ -13,12 +14,13 @@ import (
type SSH struct {
client *ssh.Client
Stderr io.Writer
}
// NewSSH wraps up some of the complexity of using the crypto/ssh pacakge
// directly assuming you want to connect using public key auth and you can pass
// a keyfile or your key is accessible through ssh agent.
func NewSSH(host, username, keyfile string) (*SSH, error) {
func NewSSH(host, username, keyfile string, stderr io.Writer) (*SSH, error) {
if username == "" {
user, err := user.Current()
if err != nil {
@ -52,13 +54,13 @@ func NewSSH(host, username, keyfile string) (*SSH, error) {
return nil, fmt.Errorf("NewSHH failed Dial: %v ", err)
}
return &SSH{client: client}, nil
return &SSH{client: client, Stderr: stderr}, nil
}
func SSHClients(hosts []string, username, keyfile string) ([]*SSH, error) {
func SSHClients(hosts []string, username, keyfile string, stderr io.Writer) ([]*SSH, error) {
clients := make([]*SSH, len(hosts))
for i, host := range hosts {
client, err := NewSSH(host, username, keyfile)
client, err := NewSSH(host, username, keyfile, stderr)
if err != nil {
return nil, err
}
@ -70,3 +72,38 @@ func SSHClients(hosts []string, username, keyfile string) ([]*SSH, error) {
func (s *SSH) NewSession() (*ssh.Session, error) {
return s.client.NewSession()
}
type remoteFile struct {
w io.WriteCloser
sess *ssh.Session
}
func (r *remoteFile) Write(p []byte) (n int, err error) {
return r.w.Write(p)
}
func (r *remoteFile) Close() error {
errc := r.w.Close()
errw := r.sess.Wait()
if errc != nil || errw != nil {
return fmt.Errorf("error closing remote file - close: '%v', wait: '%v'", errc, errw)
}
return nil
}
func (s *SSH) OpenFile(name string) (io.WriteCloser, error) {
sess, err := s.NewSession()
if err != nil {
return nil, err
}
w, err := sess.StdinPipe()
if err != nil {
return nil, err
}
err = sess.Start("cat > " + name)
if err != nil {
return nil, err
}
return &remoteFile{w: w, sess: sess}, nil
}