summaryrefslogtreecommitdiff
path: root/src/mongo/db/s
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/s')
-rw-r--r--src/mongo/db/s/config_server_op_observer.cpp7
-rw-r--r--src/mongo/db/s/config_server_op_observer.h7
-rw-r--r--src/mongo/db/s/query_analysis_op_observer.cpp7
-rw-r--r--src/mongo/db/s/query_analysis_op_observer.h7
-rw-r--r--src/mongo/db/s/range_deleter_service_op_observer.cpp6
-rw-r--r--src/mongo/db/s/range_deleter_service_op_observer.h7
-rw-r--r--src/mongo/db/s/resharding/resharding_op_observer.cpp7
-rw-r--r--src/mongo/db/s/resharding/resharding_op_observer.h7
-rw-r--r--src/mongo/db/s/resharding/resharding_service_test_helpers.h7
-rw-r--r--src/mongo/db/s/shard_server_op_observer.cpp7
-rw-r--r--src/mongo/db/s/shard_server_op_observer.h7
11 files changed, 54 insertions, 22 deletions
diff --git a/src/mongo/db/s/config_server_op_observer.cpp b/src/mongo/db/s/config_server_op_observer.cpp
index 267b9a23663..8fb62c69503 100644
--- a/src/mongo/db/s/config_server_op_observer.cpp
+++ b/src/mongo/db/s/config_server_op_observer.cpp
@@ -54,7 +54,8 @@ ConfigServerOpObserver::~ConfigServerOpObserver() = default;
void ConfigServerOpObserver::onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) {
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator) {
if (coll->ns() == VersionType::ConfigNS) {
if (!repl::ReplicationCoordinator::get(opCtx)->getMemberState().rollback()) {
uasserted(40302, "cannot delete config.version document while in --configsvr mode");
@@ -155,7 +156,9 @@ void ConfigServerOpObserver::onInserts(OperationContext* opCtx,
}
}
-void ConfigServerOpObserver::onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) {
+void ConfigServerOpObserver::onUpdate(OperationContext* opCtx,
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator) {
if (args.coll->ns().isServerConfigurationCollection()) {
auto idElement = args.updateArgs->updatedDoc["_id"];
if (idElement.type() == BSONType::String &&
diff --git a/src/mongo/db/s/config_server_op_observer.h b/src/mongo/db/s/config_server_op_observer.h
index f551d57bc55..6535e40797e 100644
--- a/src/mongo/db/s/config_server_op_observer.h
+++ b/src/mongo/db/s/config_server_op_observer.h
@@ -113,7 +113,9 @@ public:
const BSONObj& key,
const BSONObj& docKey) final {}
- void onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) override;
+ void onUpdate(OperationContext* opCtx,
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) override;
void aboutToDelete(OperationContext* opCtx,
const CollectionPtr& coll,
@@ -122,7 +124,8 @@ public:
void onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) override;
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) override;
void onInternalOpMessage(OperationContext* opCtx,
const NamespaceString& nss,
diff --git a/src/mongo/db/s/query_analysis_op_observer.cpp b/src/mongo/db/s/query_analysis_op_observer.cpp
index 71b4c4d101b..e3b8f82f79d 100644
--- a/src/mongo/db/s/query_analysis_op_observer.cpp
+++ b/src/mongo/db/s/query_analysis_op_observer.cpp
@@ -77,7 +77,9 @@ void QueryAnalysisOpObserver::onInserts(OperationContext* opCtx,
}
}
-void QueryAnalysisOpObserver::onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) {
+void QueryAnalysisOpObserver::onUpdate(OperationContext* opCtx,
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator) {
if (analyze_shard_key::supportsCoordinatingQueryAnalysis(opCtx)) {
if (args.coll->ns() == NamespaceString::kConfigQueryAnalyzersNamespace) {
const auto parsedDoc = QueryAnalyzerDocument::parse(
@@ -124,7 +126,8 @@ void QueryAnalysisOpObserver::aboutToDelete(OperationContext* opCtx,
void QueryAnalysisOpObserver::onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) {
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator) {
if (analyze_shard_key::supportsCoordinatingQueryAnalysis(opCtx)) {
if (coll->ns() == NamespaceString::kConfigQueryAnalyzersNamespace) {
auto& doc = docToDeleteDecoration(opCtx);
diff --git a/src/mongo/db/s/query_analysis_op_observer.h b/src/mongo/db/s/query_analysis_op_observer.h
index 1a13e7e6134..714d50748c9 100644
--- a/src/mongo/db/s/query_analysis_op_observer.h
+++ b/src/mongo/db/s/query_analysis_op_observer.h
@@ -110,7 +110,9 @@ public:
const BSONObj& key,
const BSONObj& docKey) final {}
- void onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) final;
+ void onUpdate(OperationContext* opCtx,
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) final;
void aboutToDelete(OperationContext* opCtx,
const CollectionPtr& coll,
@@ -119,7 +121,8 @@ public:
void onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) final;
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) final;
void onInternalOpMessage(OperationContext* opCtx,
const NamespaceString& nss,
diff --git a/src/mongo/db/s/range_deleter_service_op_observer.cpp b/src/mongo/db/s/range_deleter_service_op_observer.cpp
index 3123aa306a4..85ea0002623 100644
--- a/src/mongo/db/s/range_deleter_service_op_observer.cpp
+++ b/src/mongo/db/s/range_deleter_service_op_observer.cpp
@@ -104,7 +104,8 @@ void RangeDeleterServiceOpObserver::onInserts(OperationContext* opCtx,
}
void RangeDeleterServiceOpObserver::onUpdate(OperationContext* opCtx,
- const OplogUpdateEntryArgs& args) {
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator) {
if (args.coll->ns() == NamespaceString::kRangeDeletionNamespace) {
const bool pendingFieldIsRemoved = [&] {
return update_oplog_entry::isFieldRemovedByUpdate(
@@ -137,7 +138,8 @@ void RangeDeleterServiceOpObserver::aboutToDelete(OperationContext* opCtx,
void RangeDeleterServiceOpObserver::onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) {
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator) {
if (coll->ns() == NamespaceString::kRangeDeletionNamespace) {
const auto& deletedDoc = deletedDocumentDecoration(opCtx);
diff --git a/src/mongo/db/s/range_deleter_service_op_observer.h b/src/mongo/db/s/range_deleter_service_op_observer.h
index 4cfec3eeaae..493e07fcbf9 100644
--- a/src/mongo/db/s/range_deleter_service_op_observer.h
+++ b/src/mongo/db/s/range_deleter_service_op_observer.h
@@ -64,7 +64,9 @@ public:
const BSONObj& key,
const BSONObj& docKey) final {}
- void onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) override;
+ void onUpdate(OperationContext* opCtx,
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) override;
void aboutToDelete(OperationContext* opCtx,
const CollectionPtr& coll,
@@ -73,7 +75,8 @@ public:
void onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) override;
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) override;
private:
void onModifyCollectionShardingIndexCatalog(OperationContext* opCtx,
diff --git a/src/mongo/db/s/resharding/resharding_op_observer.cpp b/src/mongo/db/s/resharding/resharding_op_observer.cpp
index 3814f7f291c..3ddc9d984f8 100644
--- a/src/mongo/db/s/resharding/resharding_op_observer.cpp
+++ b/src/mongo/db/s/resharding/resharding_op_observer.cpp
@@ -205,7 +205,9 @@ void ReshardingOpObserver::onInserts(OperationContext* opCtx,
}
}
-void ReshardingOpObserver::onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) {
+void ReshardingOpObserver::onUpdate(OperationContext* opCtx,
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator) {
if (args.coll->ns() == NamespaceString::kDonorReshardingOperationsNamespace) {
// Primaries and secondaries should execute pinning logic when observing changes to the
// donor resharding document.
@@ -252,7 +254,8 @@ void ReshardingOpObserver::onUpdate(OperationContext* opCtx, const OplogUpdateEn
void ReshardingOpObserver::onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) {
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator) {
if (coll->ns() == NamespaceString::kDonorReshardingOperationsNamespace) {
_doPin(opCtx);
}
diff --git a/src/mongo/db/s/resharding/resharding_op_observer.h b/src/mongo/db/s/resharding/resharding_op_observer.h
index 12a6d5d83f3..ee9ac33690b 100644
--- a/src/mongo/db/s/resharding/resharding_op_observer.h
+++ b/src/mongo/db/s/resharding/resharding_op_observer.h
@@ -128,7 +128,9 @@ public:
const BSONObj& key,
const BSONObj& docKey) final {}
- void onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) override;
+ void onUpdate(OperationContext* opCtx,
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) override;
void aboutToDelete(OperationContext* opCtx,
const CollectionPtr& coll,
@@ -137,7 +139,8 @@ public:
void onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) override;
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) override;
void onInternalOpMessage(OperationContext* opCtx,
const NamespaceString& nss,
diff --git a/src/mongo/db/s/resharding/resharding_service_test_helpers.h b/src/mongo/db/s/resharding/resharding_service_test_helpers.h
index e2409bd3878..5151d035897 100644
--- a/src/mongo/db/s/resharding/resharding_service_test_helpers.h
+++ b/src/mongo/db/s/resharding/resharding_service_test_helpers.h
@@ -165,7 +165,9 @@ public:
invariant(++begin == end); // No support for inserting more than one state document yet.
}
- void onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) override {
+ void onUpdate(OperationContext* opCtx,
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) override {
if (args.coll->ns() != _stateDocumentNss) {
return;
}
@@ -179,7 +181,8 @@ public:
void onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) override {
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) override {
if (coll->ns() != _stateDocumentNss) {
return;
}
diff --git a/src/mongo/db/s/shard_server_op_observer.cpp b/src/mongo/db/s/shard_server_op_observer.cpp
index 22e813a68b7..657db377baa 100644
--- a/src/mongo/db/s/shard_server_op_observer.cpp
+++ b/src/mongo/db/s/shard_server_op_observer.cpp
@@ -270,7 +270,9 @@ void ShardServerOpObserver::onInserts(OperationContext* opCtx,
}
}
-void ShardServerOpObserver::onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) {
+void ShardServerOpObserver::onUpdate(OperationContext* opCtx,
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator) {
const auto& updateDoc = args.updateArgs->update;
// Most of these handlers do not need to run when the update is a full document replacement.
// An empty updateDoc implies a no-op update and is not a valid oplog entry.
@@ -572,7 +574,8 @@ void ShardServerOpObserver::onModifyCollectionShardingIndexCatalog(OperationCont
void ShardServerOpObserver::onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) {
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator) {
const auto& nss = coll->ns();
auto& documentId = documentIdDecoration(opCtx);
invariant(!documentId.isEmpty());
diff --git a/src/mongo/db/s/shard_server_op_observer.h b/src/mongo/db/s/shard_server_op_observer.h
index 9b48d35c372..15f91b3f344 100644
--- a/src/mongo/db/s/shard_server_op_observer.h
+++ b/src/mongo/db/s/shard_server_op_observer.h
@@ -110,7 +110,9 @@ public:
const BSONObj& key,
const BSONObj& docKey) final {}
- void onUpdate(OperationContext* opCtx, const OplogUpdateEntryArgs& args) override;
+ void onUpdate(OperationContext* opCtx,
+ const OplogUpdateEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) override;
void aboutToDelete(OperationContext* opCtx,
const CollectionPtr& coll,
@@ -119,7 +121,8 @@ public:
void onDelete(OperationContext* opCtx,
const CollectionPtr& coll,
StmtId stmtId,
- const OplogDeleteEntryArgs& args) override;
+ const OplogDeleteEntryArgs& args,
+ OpStateAccumulator* opAccumulator = nullptr) override;
void onInternalOpMessage(OperationContext* opCtx,
const NamespaceString& nss,
View Lorry Controller Status