From bcc4c746a88cc698b2937b85ec845b9d8cc736d2 Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Tue, 27 Oct 2015 12:04:55 -0700 Subject: [PATCH] MAPREDUCE-6391. util/Timer.cc completely misunderstands _POSIX_CPUTIME (Alan Burlison via aw) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/native/src/util/Timer.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index c6d72e80bf..a725481319 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -589,6 +589,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6484. Yarn Client uses local address instead of RM address as token renewer in a secure cluster when RM HA is enabled. (Zhihai Xu) + MAPREDUCE-6391. util/Timer.cc completely misunderstands _POSIX_CPUTIME + (Alan Burlison via aw) + MAPREDUCE-6480. archive-logs tool may miss applications (rkanter) MAPREDUCE-6494. Permission issue when running archive-logs tool as diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/util/Timer.cc b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/util/Timer.cc index 9f8a9ad315..e146777202 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/util/Timer.cc +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/util/Timer.cc @@ -40,7 +40,7 @@ static uint64_t clock_get() { static uint64_t clock_get() { timespec ts; - clock_gettime(_POSIX_CPUTIME, &ts); + clock_gettime(CLOCK_REALTIME, &ts); return 1000000000 * ts.tv_sec + ts.tv_nsec; }