kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-04 09:25:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Address some code review comments

Browse Source
This commit is contained in:
Preetha Appan
2017-10-31 15:05:52 -05:00
parent f588b0e0c3
commit 6bc2553eb7
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
command/alloc_status.go
View File

@@ -327,7 +327,8 @@ func (c *AllocStatusCommand) outputTaskStatus(state *api.TaskState) {
for i, event := range state.Events {
if event.DisplayMessage != "" {
formattedTime := formatUnixNanoTime(event.Time)
events[size-i] = fmt.Sprintf("%s|%s|%s", formattedTime, event.Type, event.DisplayMessage)
formattedDisplayMsg := fmt.Sprintf("%s|%s|%s", formattedTime, event.Type, event.DisplayMessage)
events[size-i] = formattedDisplayMsg
} else {
events[size-i] = buildDisplayMessage(event)
}
@@ -336,7 +337,7 @@ func (c *AllocStatusCommand) outputTaskStatus(state *api.TaskState) {
}
func buildDisplayMessage(event *api.TaskEvent) string {
formatedTime := formatUnixNanoTime(event.Time)
formattedTime := formatUnixNanoTime(event.Time)
// Build up the description based on the event type.
var desc string
@@ -447,7 +448,7 @@ func buildDisplayMessage(event *api.TaskEvent) string {
}
// Reverse order so we are sorted by time
return fmt.Sprintf("%s|%s|%s", formatedTime, event.Type, desc)
return fmt.Sprintf("%s|%s|%s", formattedTime, event.Type, desc)
}
// outputTaskResources prints the task resources for the passed task and if

4
nomad/node_endpoint.go
View File

@@ -827,10 +827,6 @@ func (n *Node) UpdateAlloc(args *structs.AllocUpdateRequest, reply *structs.Gene
}
// Add this to the batch
n.updatesLock.Lock()
now := time.Now().UTC().UnixNano()
for _, alloc := range args.Alloc {
alloc.ModifyTime = now
}
n.updates = append(n.updates, args.Alloc...)
// Start a new batch if none