SERVER-19855 Include min OpTime with shard version

This change adds the OpTime of the chunk manager as of the time its cached
metadata was loaded along with each versioned request sent from MongoS.
This includes write commands and the setShardVersion command.

The OpTime is only sent as part of this change. There will be a follow-up
change to add code to interpret this information on the MongoD side.

1 files changed, 2 insertions, 17 deletions

diff --git a/src/mongo/s/ns_targeter.h b/src/mongo/s/ns_targeter.h
index 087725697d2..1e6182b67b7 100644
--- a/src/mongo/s/ns_targeter.h
+++ b/src/mongo/s/ns_targeter.h
@@ -157,26 +157,11 @@ struct ShardEndpoint {
     ShardEndpoint(const ShardEndpoint& other)
         : shardName(other.shardName), shardVersion(other.shardVersion) {}
 
-    ShardEndpoint(const std::string& shardName, const ChunkVersion& shardVersion)
+    ShardEndpoint(const std::string& shardName, const ChunkVersionAndOpTime& shardVersion)
         : shardName(shardName), shardVersion(shardVersion) {}
 
     const std::string shardName;
-    const ChunkVersion shardVersion;
-
-    //
-    // For testing *only* - do not use as part of API
-    //
-
-    BSONObj toBSON() const {
-        BSONObjBuilder b;
-        appendBSON(&b);
-        return b.obj();
-    }
-
-    void appendBSON(BSONObjBuilder* builder) const {
-        builder->append("shardName", shardName);
-        shardVersion.addToBSON(*builder, "shardVersion");
-    }
+    const ChunkVersionAndOpTime shardVersion;
 };
 
 }  // namespace mongo