From a66c568b3b9ee0b05b8f1aff9bcdeda848aa72ea Mon Sep 17 00:00:00 2001 From: Cameron Davison Date: Mon, 8 Aug 2016 21:15:24 -0500 Subject: [PATCH] remove time flag, and update docs with new column --- command/status.go | 19 +++---------- command/status_test.go | 24 +++------------- .../source/docs/commands/status.html.md.erb | 28 +++++++++---------- website/source/docs/jobops/inspecting.html.md | 16 +++++------ .../intro/getting-started/cluster.html.md | 8 +++--- .../source/intro/getting-started/jobs.html.md | 4 +-- 6 files changed, 36 insertions(+), 63 deletions(-) diff --git a/command/status.go b/command/status.go index b82a17877ec..24fc7833e20 100644 --- a/command/status.go +++ b/command/status.go @@ -23,7 +23,6 @@ type StatusCommand struct { length int evals bool verbose bool - time bool } func (c *StatusCommand) Help() string { @@ -46,9 +45,6 @@ Status Options: -evals Display the evaluations associated with the job. - -time - Display allocation creation time. - -verbose Display full information. ` @@ -67,7 +63,6 @@ func (c *StatusCommand) Run(args []string) int { flags.BoolVar(&short, "short", false, "") flags.BoolVar(&c.evals, "evals", false, "") flags.BoolVar(&c.verbose, "verbose", false, "") - flags.BoolVar(&c.time, "time", false, "") if err := flags.Parse(args); err != nil { return 1 @@ -306,22 +301,16 @@ func (c *StatusCommand) outputJobInfo(client *api.Client, job *api.Job) error { c.Ui.Output(c.Colorize().Color("\n[bold]Allocations[reset]")) if len(jobAllocs) > 0 { allocs = make([]string, len(jobAllocs)+1) - allocs[0] = "ID|Eval ID|Node ID|Task Group|Desired|Status" - if c.time { - allocs[0] += "|Created" - } + allocs[0] = "ID|Eval ID|Node ID|Task Group|Desired|Status|Created" for i, alloc := range jobAllocs { - allocs[i+1] = fmt.Sprintf("%s|%s|%s|%s|%s|%s", + allocs[i+1] = fmt.Sprintf("%s|%s|%s|%s|%s|%s|%s", limit(alloc.ID, c.length), limit(alloc.EvalID, c.length), limit(alloc.NodeID, c.length), alloc.TaskGroup, alloc.DesiredStatus, - alloc.ClientStatus) - if c.time { - allocs[i+1] += fmt.Sprintf("|%s", - c.formatUnixNanoTime(alloc.CreateTime)) - } + alloc.ClientStatus, + c.formatUnixNanoTime(alloc.CreateTime)) } c.Ui.Output(formatList(allocs)) diff --git a/command/status_test.go b/command/status_test.go index 87cf98b893e..d65f4455b1b 100644 --- a/command/status_test.go +++ b/command/status_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - "github.com/mitchellh/cli" - "github.com/hashicorp/nomad/testutil" "github.com/hashicorp/nomad/api" + "github.com/hashicorp/nomad/testutil" + "github.com/mitchellh/cli" ) func TestStatusCommand_Implements(t *testing.T) { @@ -46,7 +46,7 @@ func TestStatusCommand_Run(t *testing.T) { } job2 := testJob("job2_sfx") - evalId2, _, err := client.Jobs().Register(job2, nil); + evalId2, _, err := client.Jobs().Register(job2, nil) if err != nil { t.Fatalf("err: %s", err) } @@ -110,22 +110,6 @@ func TestStatusCommand_Run(t *testing.T) { if !strings.Contains(out, "Allocations") { t.Fatalf("should dump allocations") } - if strings.Contains(out, "Created") { - t.Fatal("should not have created header") - } - ui.OutputWriter.Reset() - - // Query a single job in time mode - if code := cmd.Run([]string{"-address=" + url, "-time", "job1_sfx"}); code != 0 { - t.Fatalf("expected exit 0, got: %d", code) - } - out = ui.OutputWriter.String() - if strings.Contains(out, "job2_sfx") || !strings.Contains(out, "job1_sfx") { - t.Fatalf("expected only job1_sfx, got: %s", out) - } - if !strings.Contains(out, "Allocations") { - t.Fatal("should dump allocations") - } if !strings.Contains(out, "Created") { t.Fatal("should have created header") } @@ -206,4 +190,4 @@ func waitForSuccess(ui cli.Ui, client *api.Client, length int, t *testing.T, eva mon := newMonitor(ui, client, length) monErr := mon.monitor(evalId, false) return monErr -} \ No newline at end of file +} diff --git a/website/source/docs/commands/status.html.md.erb b/website/source/docs/commands/status.html.md.erb index a075ff9352c..05c6cf68efa 100644 --- a/website/source/docs/commands/status.html.md.erb +++ b/website/source/docs/commands/status.html.md.erb @@ -76,8 +76,8 @@ Status = running Periodic = false Allocations -ID Eval ID Node ID Task Group Desired Status -24cfd201 81efc2fa 8d0331e9 cache run running +ID Eval ID Node ID Task Group Desired Status Created +24cfd201 81efc2fa 8d0331e9 cache run running 08/08/16 21:03:19 CDT ``` Full status information of a job with placement failures: @@ -98,12 +98,12 @@ Task Group "cache": * Dimension "cpu exhausted" exhausted on 1 nodes Allocations -ID Eval ID Node ID Task Group Desired Status -0b8b9e37 8bf94335 8d0331e9 cache run running -b206088c 8bf94335 8d0331e9 cache run running -b82f58b6 8bf94335 8d0331e9 cache run running -ed3665f5 8bf94335 8d0331e9 cache run running -24cfd201 8bf94335 8d0331e9 cache run running +ID Eval ID Node ID Task Group Desired Status Created +0b8b9e37 8bf94335 8d0331e9 cache run running 08/08/16 21:03:19 CDT +b206088c 8bf94335 8d0331e9 cache run running 08/08/16 21:03:18 CDT +b82f58b6 8bf94335 8d0331e9 cache run running 08/08/16 21:03:17 CDT +ed3665f5 8bf94335 8d0331e9 cache run running 08/08/16 21:03:21 CDT +24cfd201 8bf94335 8d0331e9 cache run running 08/08/16 21:03:19 CDT ``` Full status information showing evaluations with a placement failure. The in @@ -133,10 +133,10 @@ Task Group "cache": * Dimension "cpu exhausted" exhausted on 1 nodes Allocations -ID Eval ID Node ID Task Group Desired Status -0b8b9e37 8bf94335 8d0331e9 cache run running -b206088c 8bf94335 8d0331e9 cache run running -b82f58b6 8bf94335 8d0331e9 cache run running -ed3665f5 8bf94335 8d0331e9 cache run running -24cfd201 8bf94335 8d0331e9 cache run running +ID Eval ID Node ID Task Group Desired Status Created +0b8b9e37 8bf94335 8d0331e9 cache run running 08/08/16 21:03:19 CDT +b206088c 8bf94335 8d0331e9 cache run running 08/08/16 21:03:19 CDT +b82f58b6 8bf94335 8d0331e9 cache run running 08/08/16 21:03:19 CDT +ed3665f5 8bf94335 8d0331e9 cache run running 08/08/16 21:03:19 CDT +24cfd201 8bf94335 8d0331e9 cache run running 08/08/16 21:03:19 CDT ``` diff --git a/website/source/docs/jobops/inspecting.html.md b/website/source/docs/jobops/inspecting.html.md index 30bed5ae1f4..af0f5cd2b6d 100644 --- a/website/source/docs/jobops/inspecting.html.md +++ b/website/source/docs/jobops/inspecting.html.md @@ -39,14 +39,14 @@ Task Group "cache": * Dimension "cpu exhausted" exhausted on 1 nodes Allocations -ID Eval ID Node ID Task Group Desired Status -12681940 8e38e6cf 4beef22f cache run running -395c5882 8e38e6cf 4beef22f cache run running -4d7c6f84 8e38e6cf 4beef22f cache run running -843b07b8 8e38e6cf 4beef22f cache run running -a8bc6d3e 8e38e6cf 4beef22f cache run running -b0beb907 8e38e6cf 4beef22f cache run running -da21c1fd 8e38e6cf 4beef22f cache run running +ID Eval ID Node ID Task Group Desired Status Created +12681940 8e38e6cf 4beef22f cache run running 08/08/16 21:03:19 CDT +395c5882 8e38e6cf 4beef22f cache run running 08/08/16 21:03:19 CDT +4d7c6f84 8e38e6cf 4beef22f cache run running 08/08/16 21:03:19 CDT +843b07b8 8e38e6cf 4beef22f cache run running 08/08/16 21:03:19 CDT +a8bc6d3e 8e38e6cf 4beef22f cache run running 08/08/16 21:03:19 CDT +b0beb907 8e38e6cf 4beef22f cache run running 08/08/16 21:03:19 CDT +da21c1fd 8e38e6cf 4beef22f cache run running 08/08/16 21:03:19 CDT ``` In the above example we see that the job has a "blocked" evaluation that is in diff --git a/website/source/intro/getting-started/cluster.html.md b/website/source/intro/getting-started/cluster.html.md index bfa0edcdb6a..bf2fc25a2ab 100644 --- a/website/source/intro/getting-started/cluster.html.md +++ b/website/source/intro/getting-started/cluster.html.md @@ -185,10 +185,10 @@ Status = running Periodic = false Allocations -ID Eval ID Node ID Task Group Desired Status -501154ac 8e0a7cf9 c887deef cache run running -7e2b3900 8e0a7cf9 fca62612 cache run running -9c66fcaf 8e0a7cf9 c887deef cache run running +ID Eval ID Node ID Task Group Desired Status Created +501154ac 8e0a7cf9 c887deef cache run running 08/08/16 21:03:19 CDT +7e2b3900 8e0a7cf9 fca62612 cache run running 08/08/16 21:03:19 CDT +9c66fcaf 8e0a7cf9 c887deef cache run running 08/08/16 21:03:19 CDT ``` We can see that all our tasks have been allocated and are running. diff --git a/website/source/intro/getting-started/jobs.html.md b/website/source/intro/getting-started/jobs.html.md index 3630ba1965f..bdedfb35d31 100644 --- a/website/source/intro/getting-started/jobs.html.md +++ b/website/source/intro/getting-started/jobs.html.md @@ -71,8 +71,8 @@ Status = running Periodic = false Allocations -ID Eval ID Node ID Task Group Desired Status -dadcdb81 61b0b423 72687b1a cache run running +ID Eval ID Node ID Task Group Desired Status Created +dadcdb81 61b0b423 72687b1a cache run running 06/23/16 01:41:13 UTC ``` Here we can see that the result of our evaluation was the creation of an