SERVER-30501 Create rollback logging component

11 files changed, 17 insertions, 9 deletions

diff --git a/buildscripts/resmokelib/core/programs.py b/buildscripts/resmokelib/core/programs.py
index 984e34f036e..29ec5cec0c9 100644
--- a/buildscripts/resmokelib/core/programs.py
+++ b/buildscripts/resmokelib/core/programs.py
@@ -34,7 +34,9 @@ def mongod_program(logger, executable=None, process_kwargs=None, **kwargs):
 
     # Turn on replication heartbeat logging.
     if "replSet" in kwargs and "logComponentVerbosity" not in suite_set_parameters:
-        suite_set_parameters["logComponentVerbosity"] = {"replication": {"heartbeats": 2}}
+        suite_set_parameters["logComponentVerbosity"] = {
+            "replication": {"heartbeats": 2, "rollback": 2}
+        }
 
     # orphanCleanupDelaySecs controls an artificial delay before cleaning up an orphaned chunk
     # that has migrated off of a shard, meant to allow most dependent queries on secondaries to
diff --git a/src/mongo/db/repl/roll_back_local_operations.cpp b/src/mongo/db/repl/roll_back_local_operations.cpp
index db538658b74..575c56cab70 100644
--- a/src/mongo/db/repl/roll_back_local_operations.cpp
+++ b/src/mongo/db/repl/roll_back_local_operations.cpp
@@ -26,7 +26,7 @@
  *    it in the license file.
  */
 
-#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplication
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplicationRollback
 
 #include "mongo/platform/basic.h"
 
diff --git a/src/mongo/db/repl/rollback_common_point_resolver.cpp b/src/mongo/db/repl/rollback_common_point_resolver.cpp
index 258fe3c9a24..34a612386cf 100644
--- a/src/mongo/db/repl/rollback_common_point_resolver.cpp
+++ b/src/mongo/db/repl/rollback_common_point_resolver.cpp
@@ -25,7 +25,7 @@
  *    exception statement from all source files in the program, then also delete
  *    it in the license file.
  */
-#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplication
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplicationRollback
 
 #include "mongo/db/repl/rollback_common_point_resolver.h"
 
diff --git a/src/mongo/db/repl/rollback_fix_up_info.cpp b/src/mongo/db/repl/rollback_fix_up_info.cpp
index 2632e021262..fb6ec4de2e4 100644
--- a/src/mongo/db/repl/rollback_fix_up_info.cpp
+++ b/src/mongo/db/repl/rollback_fix_up_info.cpp
@@ -26,7 +26,7 @@
  *    it in the license file.
  */
 
-#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplication
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplicationRollback
 
 #include "mongo/platform/basic.h"
 
diff --git a/src/mongo/db/repl/rollback_fix_up_info_descriptions.cpp b/src/mongo/db/repl/rollback_fix_up_info_descriptions.cpp
index 5dcdea123d5..5dc300b0293 100644
--- a/src/mongo/db/repl/rollback_fix_up_info_descriptions.cpp
+++ b/src/mongo/db/repl/rollback_fix_up_info_descriptions.cpp
@@ -26,7 +26,7 @@
  *    it in the license file.
  */
 
-#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplication
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplicationRollback
 
 #include "mongo/platform/basic.h"
 
diff --git a/src/mongo/db/repl/rollback_impl.cpp b/src/mongo/db/repl/rollback_impl.cpp
index b61d181c115..087cb3ab599 100644
--- a/src/mongo/db/repl/rollback_impl.cpp
+++ b/src/mongo/db/repl/rollback_impl.cpp
@@ -26,7 +26,7 @@
  *    it in the license file.
  */
 
-#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplication
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplicationRollback
 
 #include "mongo/platform/basic.h"
 
diff --git a/src/mongo/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp
index 891262f6f4f..ef7496baafa 100644
--- a/src/mongo/db/repl/rs_rollback.cpp
+++ b/src/mongo/db/repl/rs_rollback.cpp
@@ -28,7 +28,7 @@
 *    it in the license file.
 */
 
-#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplication
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplicationRollback
 
 #include "mongo/platform/basic.h"
 
diff --git a/src/mongo/db/repl/rs_rollback_no_uuid.cpp b/src/mongo/db/repl/rs_rollback_no_uuid.cpp
index fdf1b124d9d..f8fe663f8c9 100644
--- a/src/mongo/db/repl/rs_rollback_no_uuid.cpp
+++ b/src/mongo/db/repl/rs_rollback_no_uuid.cpp
@@ -28,7 +28,7 @@
 *    it in the license file.
 */
 
-#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplication
+#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kReplicationRollback
 
 #include "mongo/platform/basic.h"
 
diff --git a/src/mongo/logger/log_component.cpp b/src/mongo/logger/log_component.cpp
index acce381890e..72b87ddb3f3 100644
--- a/src/mongo/logger/log_component.cpp
+++ b/src/mongo/logger/log_component.cpp
@@ -76,6 +76,7 @@ LogComponent LogComponent::parent() const {
             DECLARE_LOG_COMPONENT_PARENT(kASIO, kNetwork);
             DECLARE_LOG_COMPONENT_PARENT(kBridge, kNetwork);
             DECLARE_LOG_COMPONENT_PARENT(kReplicationHeartbeats, kReplication);
+            DECLARE_LOG_COMPONENT_PARENT(kReplicationRollback, kReplication);
         case kNumLogComponents:
             return kNumLogComponents;
         default:
@@ -108,6 +109,8 @@ StringData LogComponent::toStringData() const {
             return "replication"_sd;
         case kReplicationHeartbeats:
             return "heartbeats"_sd;
+        case kReplicationRollback:
+            return "rollback"_sd;
         case kSharding:
             return "sharding"_sd;
         case kStorage:
@@ -182,6 +185,8 @@ StringData LogComponent::getNameForLog() const {
             return "REPL    "_sd;
         case kReplicationHeartbeats:
             return "REPL_HB "_sd;
+        case kReplicationRollback:
+            return "ROLLBACK"_sd;
         case kSharding:
             return "SHARDING"_sd;
         case kStorage:
diff --git a/src/mongo/logger/log_component.h b/src/mongo/logger/log_component.h
index 9d97a60abc8..17e5809b704 100644
--- a/src/mongo/logger/log_component.h
+++ b/src/mongo/logger/log_component.h
@@ -54,6 +54,7 @@ public:
         kQuery,
         kReplication,
         kReplicationHeartbeats,
+        kReplicationRollback,
         kSharding,
         kStorage,
         kJournal,
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index a1b9acb38a5..197a980b36e 100644
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -1103,7 +1103,7 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
                 if (programName.endsWith('mongod')) {
                     // Enable heartbeat logging for replica set nodes.
                     if (!argArrayContains("logComponentVerbosity")) {
-                        logComponentVerbosity["replication"] = {"heartbeats": 2};
+                        logComponentVerbosity["replication"] = {"heartbeats": 2, "rollback": 2};
                     }
 
                     if (jsTest.options().storageEngine === "wiredTiger" ||