kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [4/7] incubator-kudu git commit: Revert "Add a way to include request ids in log-dump"
Date Thu, 07 Jul 2016 18:33:33 GMT
Revert "Add a way to include request ids in log-dump"

This reverts commit 998414caa2bc09df40d963a6112ad9c826010176.

This went in out-of-order, ReplicateMsg doesn't have a RequestIdPB field yet.

Change-Id: I9ea031027aeb8587b112de18b8b3c8dcd16da54a
Reviewed-on: http://gerrit.cloudera.org:8080/3587
Tested-by: Kudu Jenkins
Reviewed-by: David Ribeiro Alves <dralves@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/dd341b7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/dd341b7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/dd341b7e

Branch: refs/heads/master
Commit: dd341b7ee8fac06033d9b34f5ba594c3bfca74e7
Parents: 998414c
Author: David Ribeiro Alves <dralves@apache.org>
Authored: Thu Jul 7 05:05:34 2016 +0000
Committer: David Ribeiro Alves <dralves@apache.org>
Committed: Thu Jul 7 05:24:36 2016 +0000

----------------------------------------------------------------------
 src/kudu/consensus/log-dump.cc | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/dd341b7e/src/kudu/consensus/log-dump.cc
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/log-dump.cc b/src/kudu/consensus/log-dump.cc
index 8bab8fc..e26d778 100644
--- a/src/kudu/consensus/log-dump.cc
+++ b/src/kudu/consensus/log-dump.cc
@@ -28,7 +28,6 @@
 #include "kudu/consensus/log_reader.h"
 #include "kudu/gutil/stl_util.h"
 #include "kudu/gutil/strings/numbers.h"
-#include "kudu/rpc/rpc_header.pb.h"
 #include "kudu/util/env.h"
 #include "kudu/util/flags.h"
 #include "kudu/util/logging.h"
@@ -105,8 +104,7 @@ void PrintIdOnly(const LogEntryPB& entry) {
 
 Status PrintDecodedWriteRequestPB(const string& indent,
                                   const Schema& tablet_schema,
-                                  const WriteRequestPB& write,
-                                  const rpc::RequestIdPB* request_id) {
+                                  const WriteRequestPB& write) {
   Schema request_schema;
   RETURN_NOT_OK(SchemaFromPB(write.schema(), &request_schema));
 
@@ -116,8 +114,6 @@ Status PrintDecodedWriteRequestPB(const string& indent,
   RETURN_NOT_OK(dec.DecodeOperations(&ops));
 
   cout << indent << "Tablet: " << write.tablet_id() << endl;
-  cout << indent << "RequestId: "
-      << (request_id ? request_id->ShortDebugString() : "None") << endl;
   cout << indent << "Consistency: "
        << ExternalConsistencyMode_Name(write.external_consistency_mode()) <<
endl;
   if (write.has_propagated_timestamp()) {
@@ -143,11 +139,7 @@ Status PrintDecoded(const LogEntryPB& entry, const Schema& tablet_schema)
{
 
     const ReplicateMsg& replicate = entry.replicate();
     if (replicate.op_type() == consensus::WRITE_OP) {
-      RETURN_NOT_OK(PrintDecodedWriteRequestPB(
-          indent,
-          tablet_schema,
-          replicate.write_request(),
-          replicate.has_request_id() ? &replicate.request_id() : nullptr));
+      RETURN_NOT_OK(PrintDecodedWriteRequestPB(indent, tablet_schema, replicate.write_request()));
     } else {
       cout << indent << replicate.ShortDebugString() << endl;
     }


Mime
View raw message