use safetimer and log retry interval

client/allocwatcher/alloc_watcher.go

@@ -374,28 +374,32 @@ func (p *remotePrevAlloc) Wait(ctx context.Context) error {
 		resp := structs.SingleAllocResponse{}
 		err := p.rpc.RPC("Alloc.GetAlloc", &req, &resp)
 		if err != nil {
-			p.logger.Error("error querying previous alloc", "error", err)
 			retry := getRemoteRetryIntv + helper.RandomStagger(getRemoteRetryIntv)
+			timer, stop := helper.NewSafeTimer(retry)
+			p.logger.Error("error querying previous alloc", "error", err, "wait", retry)
 			select {
-			case <-time.After(retry):
+			case <-timer.C:
 				continue
 			case <-ctx.Done():
+				stop()
 				return ctx.Err()
 			}
 		}
 
 		// Ensure that we didn't receive a stale response
 		if req.AllowStale && resp.Index < req.MinQueryIndex {
 			retry := getRemoteRetryIntv + helper.RandomStagger(getRemoteRetryIntv)
+			timer, stop := helper.NewSafeTimer(retry)
 			p.logger.Warn("received stale alloc; retrying",
 				"req_index", req.MinQueryIndex,
 				"resp_index", resp.Index,
 				"wait", retry,
 			)
 			select {
-			case <-time.After(retry):
+			case <-timer.C:
 				continue
 			case <-ctx.Done():
+				stop()
 				return ctx.Err()
 			}
 		}