This commit is contained in:
Alex Dadgar 2016-02-12 16:08:58 -08:00
parent d34a74371a
commit f6e0349d3b
5 changed files with 2 additions and 7 deletions

View File

@ -136,7 +136,6 @@ func (l *LogRotator) Start(r io.Reader) error {
} }
} }
} }
return nil
} }
// PurgeOldFiles removes older files and keeps only the last N files rotated for // PurgeOldFiles removes older files and keeps only the last N files rotated for

View File

@ -320,8 +320,6 @@ func (r *TaskRunner) run() {
// Set force start because we are restarting the task. // Set force start because we are restarting the task.
forceStart = true forceStart = true
} }
return
} }
// handleUpdate takes an updated allocation and updates internal state to // handleUpdate takes an updated allocation and updates internal state to

View File

@ -259,8 +259,6 @@ SCAN:
case <-b.duplicateCh: case <-b.duplicateCh:
goto SCAN goto SCAN
} }
return nil
} }
// Flush is used to clear the state of blocked evaluations. // Flush is used to clear the state of blocked evaluations.

View File

@ -580,7 +580,7 @@ func TestServiceSched_JobModify_InPlace(t *testing.T) {
h.AssertEvalStatus(t, structs.EvalStatusComplete) h.AssertEvalStatus(t, structs.EvalStatusComplete)
// Verify the network did not change // Verify the network did not change
rp := structs.Port{"main", 5000} rp := structs.Port{Label: "main", Value: 5000}
for _, alloc := range out { for _, alloc := range out {
for _, resources := range alloc.TaskResources { for _, resources := range alloc.TaskResources {
if resources.Networks[0].ReservedPorts[0] != rp { if resources.Networks[0].ReservedPorts[0] != rp {

View File

@ -468,7 +468,7 @@ func TestSystemSched_JobModify_InPlace(t *testing.T) {
h.AssertEvalStatus(t, structs.EvalStatusComplete) h.AssertEvalStatus(t, structs.EvalStatusComplete)
// Verify the network did not change // Verify the network did not change
rp := structs.Port{"main", 5000} rp := structs.Port{Label: "main", Value: 5000}
for _, alloc := range out { for _, alloc := range out {
for _, resources := range alloc.TaskResources { for _, resources := range alloc.TaskResources {
if resources.Networks[0].ReservedPorts[0] != rp { if resources.Networks[0].ReservedPorts[0] != rp {