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 281e7be238542b58bd8a531d14f31b4c897f50f1..3bb6768d50e5c5726608be6e0e13f54eda0e6049 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -4120,7 +4120,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 3bef606b1041288d2d6d009c76a687685d0a2a6e..612e1ee54715aad005c349b880d934c8450c8a09 100644 (file)
--- a/src/rgw/rgw_log.cc
+++ b/src/rgw/rgw_log.cc
@@ -245,7 +245,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);