Merge 9d8138c into backport/b-ott-expiration-determinism/endlessly-cl…

…osing-cardinal
hashicorp · Jul 18, 2022 · 81dcf20 · 81dcf20
2 parents 4a136c7 + 9d8138c
commit 81dcf20
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/nomad/acl_endpoint.go b/nomad/acl_endpoint.go
@@ -1013,6 +1013,8 @@ func (a *ACL) ExpireOneTimeTokens(args *structs.OneTimeTokenExpireRequest, reply
 		}
 	}
 
+	args.Timestamp = time.Now() // use the leader's timestamp
+
 	// Expire token via raft; because this is the only write in the RPC the
 	// caller can safely retry with the same token if the raft write fails
 	_, index, err := a.srv.raftApply(structs.OneTimeTokenExpireRequestType, args)