From 7128385f088ccf8776159047118b5658447ca246 Mon Sep 17 00:00:00 2001
From: jaffee <jaffee@umbel.com>
Date: Tue, 3 Jan 2017 16:36:27 -0600
Subject: [PATCH] fix references to outdated "Agents" config

---
 README.md                          | 8 ++------
 cmd/pilosactl/import.json          | 2 +-
 cmd/pilosactl/main.go              | 5 +++--
 cmd/pilosactl/randSetAndQuery.json | 2 +-
 cmd/pilosactl/randspawn.json       | 2 +-
 cmd/pilosactl/slice-height.json    | 2 +-
 cmd/pilosactl/spawn.json           | 4 ++--
 cmd/pilosactl/zipfspawn.json       | 2 +-
 8 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 02b2e2216..3b7827922 100644
--- a/README.md
+++ b/README.md
@@ -239,8 +239,7 @@ bspawn uses a json config format that has 5 top level items - an example is belo
 {
     "CreatorArgs": ["-type", "local", "-serverN", "1", "-replicaN", "1"],
     "PilosaHosts": ["localhost:19327"],
-    "Agents": { "Type": "local" },
-	"AgentHosts": ["localhost"],
+    "AgentHosts": ["agent.example.com"],
     "Benchmarks": [
         {
             "Num": 1,
@@ -261,11 +260,8 @@ Specifies the pilosa cluster that should be created to run benchmarks against. F
 #### PilosaHosts
 If PilosaHosts is set, CreatorArgs will be ignored, and an existing pilosa cluster specified by the list of hosts will be used.
 
-#### Agents
-Agents specifies the host(s) that the benchmark should be run from. Currently only running from localhost is supported.
-
 #### AgentHosts
-If AgentHosts is specified, Agents is ignored, and the existing agents specified here are used. This is not yet implemented.
+If AgentHosts is not empty, the agents specified here are used; if it is empty, agents will be run locally.
 
 #### Benchmarks
 Benchmarks is where the actual benchmarks to run are specified - each contains a `Num` which is the number of agents that should run that benchmark, and Args which specifies the benchmark. The benchmarks in the `Benchmarks` list will be run concurrently. For more information about Args, see the `pilosactl bagent -help`.
diff --git a/cmd/pilosactl/import.json b/cmd/pilosactl/import.json
index 0f5ca0d8a..bc29fb2a5 100644
--- a/cmd/pilosactl/import.json
+++ b/cmd/pilosactl/import.json
@@ -1,6 +1,6 @@
 {
     "CreatorArgs": ["-type", "local", "-serverN", "1", "-replicaN", "1"],
-    "Agents": { "Type": "local" },
+    "AgentHosts": [],
     "Benchmarks": [
         {
             "Num": 1,
diff --git a/cmd/pilosactl/main.go b/cmd/pilosactl/main.go
index d5b36153d..e606ab9c6 100644
--- a/cmd/pilosactl/main.go
+++ b/cmd/pilosactl/main.go
@@ -1325,10 +1325,11 @@ type BspawnCommand struct {
 	// should include everything that comes after `pilosactl create`
 	CreatorArgs []string
 
-	// If AgentHosts is specified, Agents is ignored, and the existing
-	// agents specified here are used.
+	// List of hosts to run agents on. If this is empty, agents will be run
+	// locally.
 	AgentHosts []string
 
+	// If this is true, build and copy pilosactl binary to agent hosts.
 	CopyBinary bool
 
 	// Benchmarks is a slice of Spawns which specifies all of the bagent
diff --git a/cmd/pilosactl/randSetAndQuery.json b/cmd/pilosactl/randSetAndQuery.json
index 714f3d035..2888dc81a 100644
--- a/cmd/pilosactl/randSetAndQuery.json
+++ b/cmd/pilosactl/randSetAndQuery.json
@@ -1,6 +1,6 @@
 {
     "CreatorArgs": ["-type", "local", "-serverN", "3", "-replicaN", "1"],
-    "Agents": { "Type": "local" },
+    "AgentHosts": [],
     "Benchmarks": [
         {
             "Num": 3,
diff --git a/cmd/pilosactl/randspawn.json b/cmd/pilosactl/randspawn.json
index 4c3d52b59..e929d946e 100644
--- a/cmd/pilosactl/randspawn.json
+++ b/cmd/pilosactl/randspawn.json
@@ -1,6 +1,6 @@
 {
     "CreatorArgs": ["-type", "local", "-serverN", "3", "-replicaN", "1"],
-    "Agents": { "Type": "local" },
+    "AgentHosts": [],
     "Benchmarks": [
         {
             "Num": 3,
diff --git a/cmd/pilosactl/slice-height.json b/cmd/pilosactl/slice-height.json
index de3025397..51d4fecb8 100644
--- a/cmd/pilosactl/slice-height.json
+++ b/cmd/pilosactl/slice-height.json
@@ -1,6 +1,6 @@
 {
     "CreatorArgs": ["-type", "local", "-serverN", "1", "-replicaN", "1"],
-    "Agents": { "Type": "local" },
+    "AgentHosts": [],
     "Benchmarks": [
         {
             "Num": 1,
diff --git a/cmd/pilosactl/spawn.json b/cmd/pilosactl/spawn.json
index b3daa8a58..d4c15bd08 100644
--- a/cmd/pilosactl/spawn.json
+++ b/cmd/pilosactl/spawn.json
@@ -1,6 +1,6 @@
 {
-    "CreatorArgs": ["-type", "local", "-serverN", "3", "-replicaN", "1"],
-    "Agents": { "Type": "local" },
+    "CreatorArgs": ["-hosts=localhost:19444,localhost:19445,localhost:19446", "-log-file-prefix", "asdfe"],
+    "AgentHosts": [],
     "Benchmarks": [
         {
             "Num": 3,
diff --git a/cmd/pilosactl/zipfspawn.json b/cmd/pilosactl/zipfspawn.json
index 6dda5a283..289322727 100644
--- a/cmd/pilosactl/zipfspawn.json
+++ b/cmd/pilosactl/zipfspawn.json
@@ -1,6 +1,6 @@
 {
     "CreatorArgs": ["-type", "local", "-serverN", "3", "-replicaN", "1"],
-    "Agents": { "Type": "local" },
+    "AgentHosts": [],
     "Benchmarks": [
         {
             "Num": 1,