rgw: fix the field 'total_time' of log entry in log show opt

Fixes: http://tracker.ceph.com/issues/17598
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
(cherry picked from commit 8f4825c5f012c77a3a91e22706dcab9c6067d77e)

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index d2c04a8fac6eb9b048441bb1f37b898c2f0e86ea..7b78a126f125f8506bbc44a5158325e39c9a8be3 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -2026,7 +2026,7 @@ int main(int argc, 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.sec() * 1000000LL + entry.total_time.usec();
 
         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 795d78787327e984d00ef31835d09c355348d7a7..a6a21837d46ab7ed61a90b41521886d50daacc6d 100644 (file)
--- a/src/rgw/rgw_log.cc
+++ b/src/rgw/rgw_log.cc
@@ -217,7 +217,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.sec() * 1000000LL + entry.total_time.usec();
 
   formatter->dump_int("total_time", total_time);
   formatter->dump_string("user_agent",  entry.user_agent);