SERVER-33798 Fail atClusterTime reads at times newer than the current cluster time

1 files changed, 21 insertions, 7 deletions

diff --git a/src/mongo/db/read_concern.cpp b/src/mongo/db/read_concern.cpp
index b5af878c5b8..95350667659 100644
--- a/src/mongo/db/read_concern.cpp
+++ b/src/mongo/db/read_concern.cpp
@@ -255,18 +255,32 @@ Status waitForReadConcern(OperationContext* opCtx,
         if (!allowAfterClusterTime) {
             return {ErrorCodes::InvalidOptions, "afterClusterTime is not allowed for this command"};
         }
-
-        auto currentTime = LogicalClock::get(opCtx)->getClusterTime();
-        if (currentTime < *afterClusterTime) {
-            return {ErrorCodes::InvalidOptions,
-                    "readConcern afterClusterTime must not be greater than clusterTime value"};
-        }
     }
 
     if (!readConcernArgs.isEmpty()) {
         invariant(!afterClusterTime || !atClusterTime);
         auto targetClusterTime = afterClusterTime ? afterClusterTime : atClusterTime;
-        if (replCoord->isReplEnabled() && targetClusterTime) {
+
+        if (targetClusterTime) {
+            std::string readConcernName = afterClusterTime ? "afterClusterTime" : "atClusterTime";
+
+            if (!replCoord->isReplEnabled()) {
+                return {ErrorCodes::IllegalOperation,
+                        str::stream() << "Cannot specify " << readConcernName
+                                      << " readConcern without replication enabled"};
+            }
+
+            auto currentTime = LogicalClock::get(opCtx)->getClusterTime();
+            if (currentTime < *targetClusterTime) {
+                return {ErrorCodes::InvalidOptions,
+                        str::stream() << "readConcern " << readConcernName
+                                      << " value must not be greater than the current clusterTime. "
+                                         "Requested clusterTime: "
+                                      << targetClusterTime->toString()
+                                      << "; current clusterTime: "
+                                      << currentTime.toString()};
+            }
+
             auto status = makeNoopWriteIfNeeded(opCtx, *targetClusterTime);
             if (!status.isOK()) {
                 LOG(0) << "Failed noop write at clusterTime: " << targetClusterTime->toString()