Merge pull request #2808 from hashicorp/b-restore-periodic

dadgar · web-flow · commit 4fc3c488ca85 · 2017-07-07T16:51:23.000-07:00
When restoring periodic jobs, take into consideration launch time zone
diff --git a/nomad/leader.go b/nomad/leader.go
@@ -299,7 +299,7 @@ func (s *Server) restorePeriodicDispatcher() error {
 		}
 
 		// nextLaunch is the next launch that should occur.
-		nextLaunch := job.Periodic.Next(launch.Launch)
+		nextLaunch := job.Periodic.Next(launch.Launch.In(job.Periodic.GetLocation()))
 
 		// We skip force launching the job if  there should be no next launch
 		// (the zero case) or if the next launch time is in the future. If it is

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ func (s *Server) restorePeriodicDispatcher() error {`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`// nextLaunch is the next launch that should occur.`
`302`		`- nextLaunch := job.Periodic.Next(launch.Launch)`
	`302`	`+ nextLaunch := job.Periodic.Next(launch.Launch.In(job.Periodic.GetLocation()))`
`303`	`303`
`304`	`304`	`// We skip force launching the job if there should be no next launch`
`305`	`305`	`// (the zero case) or if the next launch time is in the future. If it is`