luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #946 from hashicorp/f-reduce-alloc-status-verbosity 

Reduce verbosity of alloc-status
This commit is contained in:
Alex Dadgar 2016-03-20 17:05:52 -07:00
parent dab856c956 7b36d7ec55
commit db186ba995
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/driver/executor/executor_test.go
View File

@ -11,11 +11,11 @@ import (
"github.com/hashicorp/nomad/client/allocdir" "github.com/hashicorp/nomad/client/allocdir"
"github.com/hashicorp/nomad/client/driver/env" "github.com/hashicorp/nomad/client/driver/env"
cstructs "github.com/hashicorp/nomad/client/driver/structs"
"github.com/hashicorp/nomad/client/testutil" "github.com/hashicorp/nomad/client/testutil"
"github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/mock"
"github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs"
tu "github.com/hashicorp/nomad/testutil" tu "github.com/hashicorp/nomad/testutil"
cstructs "github.com/hashicorp/nomad/client/driver/structs"
) )
var ( var (

32
command/alloc_status.go
View File

@ -126,14 +126,22 @@ func (c *AllocStatusCommand) Run(args []string) int {
fmt.Sprintf("Node ID|%s", limit(alloc.NodeID, length)), fmt.Sprintf("Node ID|%s", limit(alloc.NodeID, length)),
fmt.Sprintf("Job ID|%s", alloc.JobID), fmt.Sprintf("Job ID|%s", alloc.JobID),
fmt.Sprintf("Client Status|%s", alloc.ClientStatus), fmt.Sprintf("Client Status|%s", alloc.ClientStatus),
fmt.Sprintf("Evaluated Nodes|%d", alloc.Metrics.NodesEvaluated), }
fmt.Sprintf("Filtered Nodes|%d", alloc.Metrics.NodesFiltered),
fmt.Sprintf("Exhausted Nodes|%d", alloc.Metrics.NodesExhausted), if verbose {
fmt.Sprintf("Allocation Time|%s", alloc.Metrics.AllocationTime), basic = append(basic,
fmt.Sprintf("Failures|%d", alloc.Metrics.CoalescedFailures), fmt.Sprintf("Evaluated Nodes|%d", alloc.Metrics.NodesEvaluated),
fmt.Sprintf("Filtered Nodes|%d", alloc.Metrics.NodesFiltered),
fmt.Sprintf("Exhausted Nodes|%d", alloc.Metrics.NodesExhausted),
fmt.Sprintf("Allocation Time|%s", alloc.Metrics.AllocationTime),
fmt.Sprintf("Failures|%d", alloc.Metrics.CoalescedFailures))
} }
c.Ui.Output(formatKV(basic)) c.Ui.Output(formatKV(basic))
if !short {
c.taskResources(alloc)
}
// Print the state of each task. // Print the state of each task.
if short { if short {
c.shortTaskStatus(alloc) c.shortTaskStatus(alloc)
@ -142,12 +150,9 @@ func (c *AllocStatusCommand) Run(args []string) int {
} }
// Format the detailed status // Format the detailed status
c.Ui.Output("\n==> Status") if verbose || alloc.DesiredStatus == "failed" {
dumpAllocStatus(c.Ui, alloc, length) c.Ui.Output("\n==> Status")
dumpAllocStatus(c.Ui, alloc, length)
if !short {
c.Ui.Output("\n==> Task Resources")
c.taskResources(alloc)
} }
return 0 return 0
@ -283,6 +288,11 @@ func (c *AllocStatusCommand) allocResources(alloc *api.Allocation) {
// taskResources prints out the tasks current resource usage // taskResources prints out the tasks current resource usage
func (c *AllocStatusCommand) taskResources(alloc *api.Allocation) { func (c *AllocStatusCommand) taskResources(alloc *api.Allocation) {
if len(alloc.TaskResources) == 0 {
return
}
c.Ui.Output("\n==> Task Resources")
firstLine := true firstLine := true
for task, resource := range alloc.TaskResources { for task, resource := range alloc.TaskResources {
header := fmt.Sprintf("\nTask: %q", task) header := fmt.Sprintf("\nTask: %q", task)