Apply suggestions from code review

Co-authored-by: Michael Schurter <[email protected]>
hashicorp · Jun 15, 2020 · 14cd3da · 14cd3da
1 parent fbb1092
commit 14cd3da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/command/operator_snapshot_restore.go b/command/operator_snapshot_restore.go
@@ -15,7 +15,7 @@ type OperatorSnapshotRestoreCommand struct {
 
 func (c *OperatorSnapshotRestoreCommand) Help() string {
 	helpText := `
-Usage: nomad snapshot restore [options] FILE
+Usage: nomad operator snapshot restore [options] FILE
 
   Restores an atomic, point-in-time snapshot of the state of the Nomad servers
   which includes jobs, nodes, allocations, periodic jobs, and ACLs.
@@ -30,7 +30,7 @@ Usage: nomad snapshot restore [options] FILE
 
   To restore a snapshot from the file "backup.snap":
 
-    $ nomad snapshot restore backup.snap
+    $ nomad operator snapshot restore backup.snap
 
 General Options:
 
@@ -83,7 +83,7 @@ func (c *OperatorSnapshotRestoreCommand) Run(args []string) int {
 		return 1
 	}
 
-	// Fetch the current configuration.
+	// Call snapshot restore API with backup file.
 	_, err = client.Operator().SnapshotRestore(snap, &api.WriteOptions{})
 	if err != nil {
 		c.Ui.Error(fmt.Sprintf("Failed to get restore snapshot: %v", err))

diff --git a/nomad/operator_endpoint.go b/nomad/operator_endpoint.go
@@ -609,6 +609,7 @@ func decodeStreamOutput(decoder *codec.Decoder) (io.Reader, <-chan error) {
 				if err != nil {
 					pw.CloseWithError(err)
 					errCh <- err
+					return
 				}
 			}
-Original file line number
+Diff line change
@@ Expand Up @@
     				if err != nil {
     					pw.CloseWithError(err)
     					errCh <- err
+    					return
     				}
     			}
@@ Expand Down @@