summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp1
-rw-r--r--src/mongo/db/s/config/sharding_catalog_manager.h1
-rw-r--r--src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp42
-rw-r--r--src/mongo/db/s/config/sharding_catalog_manager_commit_chunk_migration_test.cpp47
-rw-r--r--src/mongo/s/request_types/commit_chunk_migration_request_type.h1
5 files changed, 66 insertions, 26 deletions
diff --git a/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp b/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp
index 6385c417d77..81a546e5496 100644
--- a/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp
+++ b/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp
@@ -135,7 +135,6 @@ public:
opCtx,
nss,
commitRequest.getMigratedChunk(),
- commitRequest.getControlChunk(),
commitRequest.getCollectionEpoch(),
commitRequest.getFromShard(),
commitRequest.getToShard(),
diff --git a/src/mongo/db/s/config/sharding_catalog_manager.h b/src/mongo/db/s/config/sharding_catalog_manager.h
index 8200f12f4b2..15edcbd1319 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager.h
+++ b/src/mongo/db/s/config/sharding_catalog_manager.h
@@ -190,7 +190,6 @@ public:
StatusWith<BSONObj> commitChunkMigration(OperationContext* opCtx,
const NamespaceString& nss,
const ChunkType& migratedChunk,
- const boost::optional<ChunkType>& controlChunk,
const OID& collectionEpoch,
const ShardId& fromShard,
const ShardId& toShard,
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp
index bb2e5ece687..e1e8374c5c3 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp
@@ -237,6 +237,36 @@ BSONObj makeCommitChunkTransactionCommand(const NamespaceString& nss,
return BSON("applyOps" << updates.arr());
}
+/**
+ * Returns a chunk different from the one being migrated or 'none' if one doesn't exist.
+ */
+boost::optional<ChunkType> getControlChunkForMigrate(OperationContext* opCtx,
+ const NamespaceString& nss,
+ const ChunkType& migratedChunk,
+ const ShardId& fromShard) {
+ auto const configShard = Grid::get(opCtx)->shardRegistry()->getConfigShard();
+
+ BSONObjBuilder queryBuilder;
+ queryBuilder << ChunkType::ns(nss.ns());
+ queryBuilder << ChunkType::shard(fromShard.toString());
+ queryBuilder << ChunkType::min(BSON("$ne" << migratedChunk.getMin()));
+
+ auto status =
+ configShard->exhaustiveFindOnConfig(opCtx,
+ ReadPreferenceSetting{ReadPreference::PrimaryOnly},
+ repl::ReadConcernLevel::kLocalReadConcern,
+ ChunkType::ConfigNS,
+ queryBuilder.obj(),
+ {},
+ 1);
+ auto response = uassertStatusOK(status);
+ if (response.docs.empty()) {
+ return boost::none;
+ }
+
+ return uassertStatusOK(ChunkType::fromConfigBSON(response.docs.front()));
+}
+
} // namespace
Status ShardingCatalogManager::commitChunkSplit(OperationContext* opCtx,
@@ -576,7 +606,6 @@ StatusWith<BSONObj> ShardingCatalogManager::commitChunkMigration(
OperationContext* opCtx,
const NamespaceString& nss,
const ChunkType& migratedChunk,
- const boost::optional<ChunkType>& controlChunk,
const OID& collectionEpoch,
const ShardId& fromShard,
const ShardId& toShard,
@@ -652,21 +681,14 @@ StatusWith<BSONObj> ShardingCatalogManager::commitChunkMigration(
<< ")."};
}
- // Check that migratedChunk and controlChunk are where they should be, on fromShard.
-
+ // Check that migratedChunk is where it should be, on fromShard.
auto migratedOnShard =
checkChunkIsOnShard(opCtx, nss, migratedChunk.getMin(), migratedChunk.getMax(), fromShard);
if (!migratedOnShard.isOK()) {
return migratedOnShard;
}
- if (controlChunk) {
- auto controlOnShard = checkChunkIsOnShard(
- opCtx, nss, controlChunk->getMin(), controlChunk->getMax(), fromShard);
- if (!controlOnShard.isOK()) {
- return controlOnShard;
- }
- }
+ auto controlChunk = getControlChunkForMigrate(opCtx, nss, migratedChunk, fromShard);
// Find the chunk history.
const auto origChunk = _findChunkOnConfig(opCtx, nss, migratedChunk.getMin());
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_commit_chunk_migration_test.cpp b/src/mongo/db/s/config/sharding_catalog_manager_commit_chunk_migration_test.cpp
index 7a8245b1306..901c6a5b104 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_commit_chunk_migration_test.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_commit_chunk_migration_test.cpp
@@ -88,7 +88,6 @@ TEST_F(CommitChunkMigrate, CheckCorrectOpsCommandWithCtl) {
// use crefs to verify it will take consts:
ChunkType const& chunk0cref = chunk0;
- ChunkType const& chunk1cref = chunk1;
Timestamp validAfter{101, 0};
@@ -96,7 +95,6 @@ TEST_F(CommitChunkMigrate, CheckCorrectOpsCommandWithCtl) {
->commitChunkMigration(operationContext(),
chunk0.getNS(),
chunk0cref,
- chunk1cref,
origVersion.epoch(),
ShardId(shard0.getName()),
ShardId(shard1.getName()),
@@ -167,7 +165,6 @@ TEST_F(CommitChunkMigrate, CheckCorrectOpsCommandNoCtl) {
->commitChunkMigration(operationContext(),
chunk0.getNS(),
chunk0,
- boost::none,
origVersion.epoch(),
ShardId(shard0.getName()),
ShardId(shard1.getName()),
@@ -229,7 +226,6 @@ TEST_F(CommitChunkMigrate, CheckCorrectOpsCommandNoCtlTrimHistory) {
->commitChunkMigration(operationContext(),
chunk0.getNS(),
chunk0,
- boost::none,
origVersion.epoch(),
ShardId(shard0.getName()),
ShardId(shard1.getName()),
@@ -291,7 +287,6 @@ TEST_F(CommitChunkMigrate, RejectOutOfOrderHistory) {
->commitChunkMigration(operationContext(),
chunk0.getNS(),
chunk0,
- boost::none,
origVersion.epoch(),
ShardId(shard0.getName()),
ShardId(shard1.getName()),
@@ -343,7 +338,6 @@ TEST_F(CommitChunkMigrate, RejectWrongCollectionEpoch0) {
->commitChunkMigration(operationContext(),
chunk0.getNS(),
chunk0,
- chunk1,
OID::gen(),
ShardId(shard0.getName()),
ShardId(shard1.getName()),
@@ -397,7 +391,6 @@ TEST_F(CommitChunkMigrate, RejectWrongCollectionEpoch1) {
->commitChunkMigration(operationContext(),
chunk0.getNS(),
chunk0,
- chunk1,
origVersion.epoch(),
ShardId(shard0.getName()),
ShardId(shard1.getName()),
@@ -449,7 +442,6 @@ TEST_F(CommitChunkMigrate, RejectChunkMissing0) {
->commitChunkMigration(operationContext(),
chunk0.getNS(),
chunk0,
- chunk1,
origVersion.epoch(),
ShardId(shard0.getName()),
ShardId(shard1.getName()),
@@ -458,7 +450,7 @@ TEST_F(CommitChunkMigrate, RejectChunkMissing0) {
ASSERT_EQ(40165, resultBSON.getStatus().code());
}
-TEST_F(CommitChunkMigrate, RejectChunkMissing1) {
+TEST_F(CommitChunkMigrate, CommitWithLastChunkOnShardShouldNotAffectOtherChunks) {
ShardType shard0;
shard0.setName("shard0");
@@ -477,6 +469,7 @@ TEST_F(CommitChunkMigrate, RejectChunkMissing1) {
chunk0.setNS(kNamespace);
chunk0.setVersion(origVersion);
chunk0.setShard(shard0.getName());
+ chunk0.setHistory({ChunkHistory(Timestamp(100, 0), shard0.getName())});
// apportion
auto chunkMin = BSON("a" << 1);
@@ -487,27 +480,53 @@ TEST_F(CommitChunkMigrate, RejectChunkMissing1) {
ChunkType chunk1;
chunk1.setNS(kNamespace);
chunk1.setVersion(origVersion);
- chunk1.setShard(shard0.getName());
+ chunk1.setShard(shard1.getName());
chunk1.setMin(chunkMax);
auto chunkMaxax = BSON("a" << 20);
chunk1.setMax(chunkMaxax);
- setupChunks({chunk0}).transitional_ignore();
+ Timestamp ctrlChunkValidAfter = Timestamp(50, 0);
+ chunk1.setHistory({ChunkHistory(ctrlChunkValidAfter, shard1.getName())});
- Timestamp validAfter{1};
+ setupChunks({chunk0, chunk1}).transitional_ignore();
+ Timestamp validAfter{101, 0};
StatusWith<BSONObj> resultBSON = ShardingCatalogManager::get(operationContext())
->commitChunkMigration(operationContext(),
chunk0.getNS(),
chunk0,
- chunk1,
origVersion.epoch(),
ShardId(shard0.getName()),
ShardId(shard1.getName()),
validAfter);
- ASSERT_EQ(40165, resultBSON.getStatus().code());
+ ASSERT_OK(resultBSON.getStatus());
+
+ // Verify the versions returned match expected values.
+ BSONObj versions = resultBSON.getValue();
+ auto mver = ChunkVersion::parseFromBSONWithFieldForCommands(versions, "migratedChunkVersion");
+ ASSERT_OK(mver.getStatus());
+ ASSERT_EQ(ChunkVersion(origMajorVersion + 1, 0, origVersion.epoch()), mver.getValue());
+
+ ASSERT_TRUE(versions["controlChunkVersion"].eoo());
+
+ // Verify the chunks ended up in the right shards, and versions match the values returned.
+ auto chunkDoc0 = uassertStatusOK(getChunkDoc(operationContext(), chunkMin));
+ ASSERT_EQ(shard1.getName(), chunkDoc0.getShard().toString());
+ ASSERT_EQ(mver.getValue(), chunkDoc0.getVersion());
+
+ // The migrated chunk's history should be updated.
+ ASSERT_EQ(2UL, chunkDoc0.getHistory().size());
+ ASSERT_EQ(validAfter, chunkDoc0.getHistory().front().getValidAfter());
+
+ auto chunkDoc1 = uassertStatusOK(getChunkDoc(operationContext(), chunkMax));
+ ASSERT_EQ(shard1.getName(), chunkDoc1.getShard().toString());
+ ASSERT_EQ(chunk1.getVersion(), chunkDoc1.getVersion());
+
+ // The control chunk's history should be unchanged.
+ ASSERT_EQ(1UL, chunkDoc1.getHistory().size());
+ ASSERT_EQ(ctrlChunkValidAfter, chunkDoc1.getHistory().front().getValidAfter());
}
} // namespace
diff --git a/src/mongo/s/request_types/commit_chunk_migration_request_type.h b/src/mongo/s/request_types/commit_chunk_migration_request_type.h
index f403572e46e..c7cd1a2bd2d 100644
--- a/src/mongo/s/request_types/commit_chunk_migration_request_type.h
+++ b/src/mongo/s/request_types/commit_chunk_migration_request_type.h
@@ -97,6 +97,7 @@ struct CommitChunkMigrationRequest {
// The chunk being moved.
ChunkType _migratedChunk;
+ // TODO: SERVER-35209 Remove after v4.0, kept around for backwards compatibility.
// A chunk on the shard moved from, if any remain.
boost::optional<ChunkType> _controlChunk;
View Lorry Controller Status