SERVER-66833 Improve error and log messages on attempt to use unsupported legacy op code

(cherry picked from commit 6147e2b653fe414ce8f6d64454d9b98802863ae7)

3 files changed, 12 insertions, 12 deletions

diff --git a/src/mongo/s/commands/cluster_get_last_error_cmd.cpp b/src/mongo/s/commands/cluster_get_last_error_cmd.cpp
index 9a1d73c015b..83900625783 100644
--- a/src/mongo/s/commands/cluster_get_last_error_cmd.cpp
+++ b/src/mongo/s/commands/cluster_get_last_error_cmd.cpp
@@ -30,7 +30,7 @@
 #include "mongo/platform/basic.h"
 
 #include "mongo/db/commands.h"
-#include "mongo/rpc/warn_deprecated_wire_ops.h"
+#include "mongo/rpc/warn_unsupported_wire_ops.h"
 
 namespace mongo {
 namespace {
@@ -62,7 +62,7 @@ public:
     }
 
     virtual bool run(OperationContext*, const std::string&, const BSONObj&, BSONObjBuilder&) {
-        warnDeprecation(cc(), "getLastError");
+        warnUnsupportedOp(cc(), "getLastError");
         uasserted(5739001, "getLastError command is not supported");
         return false;
     }
diff --git a/src/mongo/s/commands/strategy.cpp b/src/mongo/s/commands/strategy.cpp
index 777d24bf257..13d061e9e6d 100644
--- a/src/mongo/s/commands/strategy.cpp
+++ b/src/mongo/s/commands/strategy.cpp
@@ -75,7 +75,7 @@
 #include "mongo/rpc/op_msg.h"
 #include "mongo/rpc/op_msg_rpc_impls.h"
 #include "mongo/rpc/rewrite_state_change_errors.h"
-#include "mongo/rpc/warn_deprecated_wire_ops.h"
+#include "mongo/rpc/warn_unsupported_wire_ops.h"
 #include "mongo/s/catalog_cache.h"
 #include "mongo/s/client/shard_registry.h"
 #include "mongo/s/cluster_commands_helpers.h"
diff --git a/src/mongo/s/service_entry_point_mongos.cpp b/src/mongo/s/service_entry_point_mongos.cpp
index 43e2d5213f0..12ebf1299bd 100644
--- a/src/mongo/s/service_entry_point_mongos.cpp
+++ b/src/mongo/s/service_entry_point_mongos.cpp
@@ -48,7 +48,7 @@
 #include "mongo/db/stats/counters.h"
 #include "mongo/logv2/log.h"
 #include "mongo/rpc/message.h"
-#include "mongo/rpc/warn_deprecated_wire_ops.h"
+#include "mongo/rpc/warn_unsupported_wire_ops.h"
 #include "mongo/s/commands/strategy.h"
 #include "mongo/s/grid.h"
 #include "mongo/s/load_balancer_support.h"
@@ -144,36 +144,36 @@ Future<DbResponse> HandleRequest::handleRequest() {
         case dbQuery:
             if (!nsString.isCommand()) {
                 globalOpCounters.gotQueryDeprecated();
-                warnDeprecation(*(rec->getOpCtx()->getClient()), networkOpToString(dbQuery));
+                warnUnsupportedOp(*(rec->getOpCtx()->getClient()), networkOpToString(dbQuery));
                 return Future<DbResponse>::makeReady(
-                    makeErrorResponseToDeprecatedOpQuery("OP_QUERY is no longer supported"));
+                    makeErrorResponseToUnsupportedOpQuery("OP_QUERY is no longer supported"));
             }
         // FALLTHROUGH: it's a query containing a command
         case dbMsg:
             return std::make_unique<CommandOpRunner>(shared_from_this())->run();
         case dbGetMore: {
             globalOpCounters.gotGetMoreDeprecated();
-            warnDeprecation(*(rec->getOpCtx()->getClient()), networkOpToString(dbGetMore));
+            warnUnsupportedOp(*(rec->getOpCtx()->getClient()), networkOpToString(dbGetMore));
             return Future<DbResponse>::makeReady(
-                makeErrorResponseToDeprecatedOpQuery("OP_GET_MORE is no longer supported"));
+                makeErrorResponseToUnsupportedOpQuery("OP_GET_MORE is no longer supported"));
         }
         case dbKillCursors:
             globalOpCounters.gotKillCursorsDeprecated();
-            warnDeprecation(*(rec->getOpCtx()->getClient()), networkOpToString(op));
+            warnUnsupportedOp(*(rec->getOpCtx()->getClient()), networkOpToString(op));
             uasserted(5745707, "OP_KILL_CURSORS is no longer supported");
         case dbInsert: {
             auto opInsert = InsertOp::parseLegacy(rec->getMessage());
             globalOpCounters.gotInsertsDeprecated(opInsert.getDocuments().size());
-            warnDeprecation(*(rec->getOpCtx()->getClient()), networkOpToString(op));
+            warnUnsupportedOp(*(rec->getOpCtx()->getClient()), networkOpToString(op));
             uasserted(5745706, "OP_INSERT is no longer supported");
         }
         case dbUpdate:
             globalOpCounters.gotUpdateDeprecated();
-            warnDeprecation(*(rec->getOpCtx()->getClient()), networkOpToString(op));
+            warnUnsupportedOp(*(rec->getOpCtx()->getClient()), networkOpToString(op));
             uasserted(5745705, "OP_UPDATE is no longer supported");
         case dbDelete:
             globalOpCounters.gotDeleteDeprecated();
-            warnDeprecation(*(rec->getOpCtx()->getClient()), networkOpToString(op));
+            warnUnsupportedOp(*(rec->getOpCtx()->getClient()), networkOpToString(op));
             uasserted(5745704, "OP_DELETE is no longer supported");
         default:
             MONGO_UNREACHABLE;