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/initial_split_policy.cpp43
-rw-r--r--src/mongo/db/s/config/initial_split_policy_test.cpp16
-rw-r--r--src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp1
-rw-r--r--src/mongo/db/s/merge_chunks_command.cpp5
-rw-r--r--src/mongo/db/s/migration_source_manager.cpp18
-rw-r--r--src/mongo/db/s/shardsvr_shard_collection.cpp1
6 files changed, 42 insertions, 42 deletions
diff --git a/src/mongo/db/s/config/initial_split_policy.cpp b/src/mongo/db/s/config/initial_split_policy.cpp
index 36c0f1bf15b..60c719d521d 100644
--- a/src/mongo/db/s/config/initial_split_policy.cpp
+++ b/src/mongo/db/s/config/initial_split_policy.cpp
@@ -34,8 +34,8 @@
#include "mongo/db/s/config/initial_split_policy.h"
#include "mongo/client/read_preference.h"
-#include "mongo/db/logical_clock.h"
#include "mongo/db/pipeline/sharded_agg_helpers.h"
+#include "mongo/db/vector_clock.h"
#include "mongo/s/balancer_configuration.h"
#include "mongo/s/catalog/type_shard.h"
#include "mongo/s/grid.h"
@@ -273,11 +273,12 @@ InitialSplitPolicy::ShardCollectionConfig SingleChunkOnPrimarySplitPolicy::creat
ShardCollectionConfig initialChunks;
ChunkVersion version(1, 0, OID::gen());
const auto& keyPattern = shardKeyPattern.getKeyPattern();
+ const auto currentTime = VectorClock::get(opCtx)->getTime();
appendChunk(params.nss,
keyPattern.globalMin(),
keyPattern.globalMax(),
&version,
- LogicalClock::get(opCtx)->getClusterTime().asTimestamp(),
+ currentTime.clusterTime().asTimestamp(),
params.primaryShardId,
&initialChunks.chunks);
return initialChunks;
@@ -301,14 +302,14 @@ InitialSplitPolicy::ShardCollectionConfig UnoptimizedSplitPolicy::createFirstChu
shardKeyPattern.getKeyPattern().globalMax()),
balancerConfig->getMaxChunkSizeBytes(),
0));
- return generateShardCollectionInitialChunks(
- params.nss,
- shardKeyPattern,
- params.primaryShardId,
- LogicalClock::get(opCtx)->getClusterTime().asTimestamp(),
- shardSelectedSplitPoints,
- shardIds,
- 1 // numContiguousChunksPerShard
+ const auto currentTime = VectorClock::get(opCtx)->getTime();
+ return generateShardCollectionInitialChunks(params.nss,
+ shardKeyPattern,
+ params.primaryShardId,
+ currentTime.clusterTime().asTimestamp(),
+ shardSelectedSplitPoints,
+ shardIds,
+ 1 // numContiguousChunksPerShard
);
}
@@ -321,14 +322,14 @@ InitialSplitPolicy::ShardCollectionConfig SplitPointsBasedSplitPolicy::createFir
std::vector<ShardId> shardIds;
shardRegistry->getAllShardIdsNoReload(&shardIds);
- return generateShardCollectionInitialChunks(
- params.nss,
- shardKeyPattern,
- params.primaryShardId,
- LogicalClock::get(opCtx)->getClusterTime().asTimestamp(),
- _splitPoints,
- shardIds,
- _numContiguousChunksPerShard);
+ const auto currentTime = VectorClock::get(opCtx)->getTime();
+ return generateShardCollectionInitialChunks(params.nss,
+ shardKeyPattern,
+ params.primaryShardId,
+ currentTime.clusterTime().asTimestamp(),
+ _splitPoints,
+ shardIds,
+ _numContiguousChunksPerShard);
}
AbstractTagsBasedSplitPolicy::AbstractTagsBasedSplitPolicy(OperationContext* opCtx,
@@ -356,7 +357,8 @@ InitialSplitPolicy::ShardCollectionConfig AbstractTagsBasedSplitPolicy::createFi
std::vector<ShardId> shardIds;
shardRegistry->getAllShardIdsNoReload(&shardIds);
- const auto validAfter = LogicalClock::get(opCtx)->getClusterTime().asTimestamp();
+ const auto currentTime = VectorClock::get(opCtx)->getTime();
+ const auto validAfter = currentTime.clusterTime().asTimestamp();
const auto& keyPattern = shardKeyPattern.getKeyPattern();
auto tagToShards = getTagsToShardIds();
@@ -667,12 +669,13 @@ ReshardingSplitPolicy::ReshardingSplitPolicy(OperationContext* opCtx,
InitialSplitPolicy::ShardCollectionConfig ReshardingSplitPolicy::createFirstChunks(
OperationContext* opCtx, const ShardKeyPattern& shardKeyPattern, SplitPolicyParams params) {
+ const auto currentTime = VectorClock::get(opCtx)->getTime();
return createChunks(shardKeyPattern,
params,
_numContiguousChunksPerShard,
_recipientShardIds,
_splitPoints,
- LogicalClock::get(opCtx)->getClusterTime().asTimestamp());
+ currentTime.clusterTime().asTimestamp());
}
} // namespace mongo
diff --git a/src/mongo/db/s/config/initial_split_policy_test.cpp b/src/mongo/db/s/config/initial_split_policy_test.cpp
index a8702c81606..b974830f7f5 100644
--- a/src/mongo/db/s/config/initial_split_policy_test.cpp
+++ b/src/mongo/db/s/config/initial_split_policy_test.cpp
@@ -32,9 +32,9 @@
#include "mongo/platform/basic.h"
#include "mongo/bson/json.h"
-#include "mongo/db/logical_clock.h"
#include "mongo/db/s/config/config_server_test_fixture.h"
#include "mongo/db/s/config/initial_split_policy.h"
+#include "mongo/db/vector_clock.h"
#include "mongo/s/catalog/type_shard.h"
#include "mongo/s/catalog/type_tags.h"
#include "mongo/unittest/unittest.h"
@@ -331,10 +331,9 @@ public:
const auto shardCollectionConfig =
splitPolicy.createFirstChunks(opCtx, shardKeyPattern, {});
- const std::vector<ChunkType> expectedChunks =
- makeChunks(expectedChunkRanges,
- expectedShardIds,
- LogicalClock::get(opCtx)->getClusterTime().asTimestamp());
+ const auto currentTime = VectorClock::get(opCtx)->getTime();
+ const std::vector<ChunkType> expectedChunks = makeChunks(
+ expectedChunkRanges, expectedShardIds, currentTime.clusterTime().asTimestamp());
assertChunkVectorsAreEqual(expectedChunks, shardCollectionConfig.chunks);
}
@@ -582,10 +581,9 @@ public:
const auto shardCollectionConfig =
splitPolicy.createFirstChunks(operationContext(), shardKeyPattern, {});
- const std::vector<ChunkType> expectedChunks =
- makeChunks(expectedChunkRanges,
- expectedShardIds,
- LogicalClock::get(operationContext())->getClusterTime().asTimestamp());
+ const auto currentTime = VectorClock::get(operationContext())->getTime();
+ const std::vector<ChunkType> expectedChunks = makeChunks(
+ expectedChunkRanges, expectedShardIds, currentTime.clusterTime().asTimestamp());
assertChunkVectorsAreEqual(expectedChunks, shardCollectionConfig.chunks);
}
};
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp
index 01aedaceb5e..23b6688bf9e 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp
@@ -48,7 +48,6 @@
#include "mongo/db/catalog/collection_options.h"
#include "mongo/db/client.h"
#include "mongo/db/commands.h"
-#include "mongo/db/logical_clock.h"
#include "mongo/db/logical_session_cache.h"
#include "mongo/db/namespace_string.h"
#include "mongo/db/operation_context.h"
diff --git a/src/mongo/db/s/merge_chunks_command.cpp b/src/mongo/db/s/merge_chunks_command.cpp
index 7dd1cb1f20d..0eb7a19ac65 100644
--- a/src/mongo/db/s/merge_chunks_command.cpp
+++ b/src/mongo/db/s/merge_chunks_command.cpp
@@ -37,11 +37,11 @@
#include "mongo/db/catalog_raii.h"
#include "mongo/db/commands.h"
#include "mongo/db/field_parser.h"
-#include "mongo/db/logical_clock.h"
#include "mongo/db/namespace_string.h"
#include "mongo/db/s/collection_sharding_runtime.h"
#include "mongo/db/s/shard_filtering_metadata_refresh.h"
#include "mongo/db/s/sharding_state.h"
+#include "mongo/db/vector_clock.h"
#include "mongo/logv2/log.h"
#include "mongo/s/catalog/type_chunk.h"
#include "mongo/s/client/shard_registry.h"
@@ -196,11 +196,12 @@ void mergeChunks(OperationContext* opCtx,
//
// Run _configsvrCommitChunkMerge.
//
+ const auto currentTime = VectorClock::get(opCtx)->getTime();
MergeChunkRequest request{nss,
shardingState->shardId().toString(),
epoch,
chunkBoundaries,
- LogicalClock::get(opCtx)->getClusterTime().asTimestamp()};
+ currentTime.clusterTime().asTimestamp()};
auto configCmdObj =
request.toConfigCommandBSON(ShardingCatalogClient::kMajorityWriteConcern.toBSON());
diff --git a/src/mongo/db/s/migration_source_manager.cpp b/src/mongo/db/s/migration_source_manager.cpp
index 07f8f94daf9..caca00e850f 100644
--- a/src/mongo/db/s/migration_source_manager.cpp
+++ b/src/mongo/db/s/migration_source_manager.cpp
@@ -36,7 +36,6 @@
#include "mongo/bson/bsonobjbuilder.h"
#include "mongo/db/catalog_raii.h"
#include "mongo/db/concurrency/write_conflict_exception.h"
-#include "mongo/db/logical_clock.h"
#include "mongo/db/logical_session_cache.h"
#include "mongo/db/logical_session_id_helpers.h"
#include "mongo/db/op_observer.h"
@@ -53,6 +52,7 @@
#include "mongo/db/s/sharding_state.h"
#include "mongo/db/s/sharding_state_recovery.h"
#include "mongo/db/s/sharding_statistics.h"
+#include "mongo/db/vector_clock.h"
#include "mongo/executor/task_executor.h"
#include "mongo/executor/task_executor_pool.h"
#include "mongo/logv2/log.h"
@@ -408,14 +408,14 @@ Status MigrationSourceManager::commitChunkMetadataOnConfig() {
migratedChunkType.setMax(_args.getMaxKey());
migratedChunkType.setVersion(_chunkVersion);
- CommitChunkMigrationRequest::appendAsCommand(
- &builder,
- getNss(),
- _args.getFromShardId(),
- _args.getToShardId(),
- migratedChunkType,
- metadata.getCollVersion(),
- LogicalClock::get(_opCtx)->getClusterTime().asTimestamp());
+ const auto currentTime = VectorClock::get(_opCtx)->getTime();
+ CommitChunkMigrationRequest::appendAsCommand(&builder,
+ getNss(),
+ _args.getFromShardId(),
+ _args.getToShardId(),
+ migratedChunkType,
+ metadata.getCollVersion(),
+ currentTime.clusterTime().asTimestamp());
builder.append(kWriteConcernField, kMajorityWriteConcern.toBSON());
}
diff --git a/src/mongo/db/s/shardsvr_shard_collection.cpp b/src/mongo/db/s/shardsvr_shard_collection.cpp
index 7488d687790..a311110cc98 100644
--- a/src/mongo/db/s/shardsvr_shard_collection.cpp
+++ b/src/mongo/db/s/shardsvr_shard_collection.cpp
@@ -41,7 +41,6 @@
#include "mongo/db/dbdirectclient.h"
#include "mongo/db/hasher.h"
#include "mongo/db/index/index_descriptor.h"
-#include "mongo/db/logical_clock.h"
#include "mongo/db/namespace_string.h"
#include "mongo/db/query/collation/collator_factory_interface.h"
#include "mongo/db/s/active_shard_collection_registry.h"
View Lorry Controller Status