From: Jiaying Ren Date: Thu, 7 Sep 2017 06:50:50 +0000 (+0800) Subject: rgw: fix total_time to msec as per AWS S3 X-Git-Tag: v13.0.1~574^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d84cb650de5d53671a3d855c9e14894a440a466a;p=ceph.git rgw: fix total_time to msec as per AWS S3 As AWS log format[1] are using millisecond as unit, change rgw total_time unit from usec to msec. [1] http://docs.aws.amazon.com/AmazonS3/latest/dev/LogFormat.html Reported-by: Zhang Shaowen Signed-off-by: Jiaying Ren --- diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 2634af232943..32f866b4e6c8 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -5049,7 +5049,7 @@ int main(int argc, const char **argv) formatter->open_array_section("log_entries"); do { - uint64_t total_time = entry.total_time.sec() * 1000000LL + entry.total_time.usec(); + uint64_t total_time = entry.total_time.to_msec(); agg_time += total_time; agg_bytes_sent += entry.bytes_sent; diff --git a/src/rgw/rgw_log.cc b/src/rgw/rgw_log.cc index b8378174ee87..b39b30b15273 100644 --- a/src/rgw/rgw_log.cc +++ b/src/rgw/rgw_log.cc @@ -251,7 +251,7 @@ void rgw_format_ops_log_entry(struct rgw_log_entry& entry, Formatter *formatter) formatter->dump_int("bytes_sent", entry.bytes_sent); formatter->dump_int("bytes_received", entry.bytes_received); formatter->dump_int("object_size", entry.obj_size); - uint64_t total_time = entry.total_time.sec() * 1000000LL + entry.total_time.usec(); + uint64_t total_time = entry.total_time.to_msec(); formatter->dump_int("total_time", total_time); formatter->dump_string("user_agent", entry.user_agent);