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

gc: be consistent with setting create/modify timestamp tz (#24389)

Browse Source 
Whenever setting objects creation/modify time, we should always use UTC. #24112
introduced some inconsistencies in this area, and this PR fixes it.
This commit is contained in:
Piotr Kazmierczak
2024-11-07 22:53:54 +01:00
committed by GitHub
parent 30849c518e
commit c5249c6ca4
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nomad/blocked_evals.go
View File

@@ -411,7 +411,7 @@ func (b *BlockedEvals) Unblock(computedClass string, index uint64) {
// Store the index in which the unblock happened. We use this on subsequent
// block calls in case the evaluation was in the scheduler when a trigger
// occurred.
b.unblockIndexes[computedClass] = unblockEvent{index, time.Now()}
b.unblockIndexes[computedClass] = unblockEvent{index, time.Now().UTC()}
// Capture chan in lock as Flush overwrites it
ch := b.capacityChangeCh
@@ -446,7 +446,7 @@ func (b *BlockedEvals) UnblockQuota(quota string, index uint64) {
// Store the index in which the unblock happened. We use this on subsequent
// block calls in case the evaluation was in the scheduler when a trigger
// occurred.
b.unblockIndexes[quota] = unblockEvent{index, time.Now()}
b.unblockIndexes[quota] = unblockEvent{index, time.Now().UTC()}
ch := b.capacityChangeCh
done := b.stopCh
b.l.Unlock()
@@ -475,7 +475,7 @@ func (b *BlockedEvals) UnblockClassAndQuota(class, quota string, index uint64) {
// Store the index in which the unblock happened. We use this on subsequent
// block calls in case the evaluation was in the scheduler when a trigger
// occurred.
now := time.Now()
now := time.Now().UTC()
if quota != "" {
b.unblockIndexes[quota] = unblockEvent{index, now}
}

2
nomad/core_sched.go
View File

@@ -375,7 +375,7 @@ func (c *CoreScheduler) gcEval(eval *structs.Evaluation, cutoffTime time.Time, a
gcEval := true
var gcAllocIDs []string
for _, alloc := range allocs {
if !allocGCEligible(alloc, job, time.Now(), cutoffTime) {
if !allocGCEligible(alloc, job, time.Now().UTC(), cutoffTime) {
// Can't GC the evaluation since not all of the allocations are
// terminal
gcEval = false

16
nomad/core_sched_test.go
View File

@@ -34,8 +34,8 @@ func TestCoreScheduler_EvalGC(t *testing.T) {
// Insert "dead" eval
store := s1.fsm.State()
eval := mock.Eval()
eval.CreateTime = time.Now().Add(-6 * time.Hour).UnixNano() // make sure objects we insert are older than GC thresholds
eval.ModifyTime = time.Now().Add(-5 * time.Hour).UnixNano()
eval.CreateTime = time.Now().UTC().Add(-6 * time.Hour).UnixNano() // make sure objects we insert are older than GC thresholds
eval.ModifyTime = time.Now().UTC().Add(-5 * time.Hour).UnixNano()
eval.Status = structs.EvalStatusFailed
must.NoError(t, store.UpsertJobSummary(999, mock.JobSummary(eval.JobID)))
must.NoError(t, store.UpsertEvals(structs.MsgTypeTestSetup, 1000, []*structs.Evaluation{eval}))
@@ -120,8 +120,8 @@ func TestCoreScheduler_EvalGC_ReschedulingAllocs(t *testing.T) {
// Insert "dead" eval
store := s1.fsm.State()
eval := mock.Eval()
eval.CreateTime = time.Now().Add(-6 * time.Hour).UnixNano() // make sure objects we insert are older than GC thresholds
eval.ModifyTime = time.Now().Add(-5 * time.Hour).UnixNano()
eval.CreateTime = time.Now().UTC().Add(-6 * time.Hour).UnixNano() // make sure objects we insert are older than GC thresholds
eval.ModifyTime = time.Now().UTC().Add(-5 * time.Hour).UnixNano()
eval.Status = structs.EvalStatusFailed
must.NoError(t, store.UpsertJobSummary(999, mock.JobSummary(eval.JobID)))
must.NoError(t, store.UpsertEvals(structs.MsgTypeTestSetup, 1000, []*structs.Evaluation{eval}))
@@ -129,8 +129,8 @@ func TestCoreScheduler_EvalGC_ReschedulingAllocs(t *testing.T) {
// Insert "pending" eval for same job
eval2 := mock.Eval()
eval2.JobID = eval.JobID
eval2.CreateTime = time.Now().Add(-6 * time.Hour).UnixNano() // make sure objects we insert are older than GC thresholds
eval2.ModifyTime = time.Now().Add(-5 * time.Hour).UnixNano()
eval2.CreateTime = time.Now().UTC().Add(-6 * time.Hour).UnixNano() // make sure objects we insert are older than GC thresholds
eval2.ModifyTime = time.Now().UTC().Add(-5 * time.Hour).UnixNano()
must.NoError(t, store.UpsertJobSummary(999, mock.JobSummary(eval2.JobID)))
must.NoError(t, store.UpsertEvals(structs.MsgTypeTestSetup, 1003, []*structs.Evaluation{eval2}))
@@ -215,8 +215,8 @@ func TestCoreScheduler_EvalGC_StoppedJob_Reschedulable(t *testing.T) {
store := s1.fsm.State()
eval := mock.Eval()
eval.Status = structs.EvalStatusFailed
eval.CreateTime = time.Now().Add(-6 * time.Hour).UnixNano() // make sure objects we insert are older than GC thresholds
eval.ModifyTime = time.Now().Add(-5 * time.Hour).UnixNano()
eval.CreateTime = time.Now().UTC().Add(-6 * time.Hour).UnixNano() // make sure objects we insert are older than GC thresholds
eval.ModifyTime = time.Now().UTC().Add(-5 * time.Hour).UnixNano()
must.NoError(t, store.UpsertJobSummary(999, mock.JobSummary(eval.JobID)))
must.NoError(t, store.UpsertEvals(structs.MsgTypeTestSetup, 1000, []*structs.Evaluation{eval}))

4
nomad/mock/csi.go
View File

@@ -51,8 +51,8 @@ func CSIVolume(plugin *structs.CSIPlugin) *structs.CSIVolume {
ControllersExpected: len(plugin.Controllers),
NodesHealthy: plugin.NodesHealthy,
NodesExpected: len(plugin.Nodes),
CreateTime: time.Now().Add(-6 * time.Hour).UnixNano(),
ModifyTime: time.Now().Add(-5 * time.Hour).UnixNano(),
CreateTime: time.Now().UTC().Add(-6 * time.Hour).UnixNano(),
ModifyTime: time.Now().UTC().Add(-5 * time.Hour).UnixNano(),
}
}

2
nomad/mock/job.go
View File

@@ -144,7 +144,7 @@ func Job() *structs.Job {
CreateIndex: 42,
ModifyIndex: 99,
JobModifyIndex: 99,
SubmitTime: time.Now().Add(-6 * time.Hour).UnixNano(),
SubmitTime: time.Now().UTC().Add(-6 * time.Hour).UnixNano(),
}
job.Canonicalize()
return job

2
scheduler/reconcile.go
View File

@@ -216,7 +216,7 @@ func NewAllocReconciler(logger log.Logger, allocUpdateFn allocUpdateType, batch
evalID: evalID,
evalPriority: evalPriority,
supportsDisconnectedClients: supportsDisconnectedClients,
now: time.Now(),
now: time.Now().UTC(),
result: &reconcileResults{
attributeUpdates: make(map[string]*structs.Allocation),
disconnectUpdates: make(map[string]*structs.Allocation),