MB-51513: Merge branch 'couchbase/cheshire-cat' into 'couchbase/neo'

* couchbase/cheshire-cat:
  MB-51513: Revert "MB-34280: Set max DCP name to 200 characters"

Change-Id: Id1b62383dc04168046510aa7a5f2dace4e98011d

Author: jimwwalker

daemon/mcbp_validators.cc

@@ -573,14 +573,6 @@ static Status dcp_open_validator(Cookie& cookie) {
                                 "consumer_name must be a string");
                         return Status::Einval;
                     }
-                    auto nm = kv.value().get<std::string>();
-                    if (nm.size() > cb::limits::MaxDcpName) {
-                        cookie.setErrorContext(
-                                "consumer_name limit is " +
-                                std::to_string(cb::limits::MaxDcpName) +
-                                " characters");
-                        return Status::Einval;
-                    }
                 } else {
                     cookie.setErrorContext("Unsupported JSON property " +
                                            kv.key());
@@ -592,14 +584,6 @@ static Status dcp_open_validator(Cookie& cookie) {
             return Status::Einval;
         }
     }
-
-    if (size_t(cookie.getHeader().getKeylen()) > cb::limits::MaxDcpName) {
-        cookie.setErrorContext("Dcp name limit is " +
-                               std::to_string(cb::limits::MaxDcpName) +
-                               " characters");
-        return Status::Einval;
-    }
-
     return verify_common_dcp_restrictions(cookie);
 }
 

docs/dcp/documentation/commands/open-connection.md

@@ -43,12 +43,7 @@ Flags are specified as a bitmask in network byte order with the following bits d
 
 When setting the Producer or Consumer flag the sender is telling the server what type of connection will be created. For example, if the Producer type is set then the sender of the Open Connection message will be a Consumer.
 
-The connection name is specified using the key field. When selecting a name the
-only requirement is that the name take up no more space than 200 bytes. It is
-recommended that the name uses that ASCII character set and uses alpha-numeric
-characters. It is highly advantageous for improved supportability Couchbase
-Server that the connection names embed as much contextual information as
-possible from the client.
+The connection name is specified using the key field. When selecting a name the only requirement is that the name take up no more space than 256 bytes. It is recommended that the name uses that ASCII character set and uses alpha-numeric characters. It is highly advantageous for improved supportability Couchbase Server that the connection names embed as much contextual information as possible from the client.
 
 As of version 6.5, the _value_ can be used to specify additional information
 about the connection to be opened. If non-empty, the value must be a JSON

engines/ep/src/connhandler.h

@@ -81,9 +81,6 @@ struct ConnCounter {
 
 class ConnHandler : public DcpConnHandlerIface {
 public:
-    /// The maximum length of a DCP stat name
-    static constexpr size_t MaxDcpStatNameLength = 47;
-
     enum class PausedReason : uint8_t {
         BufferLogFull,
         Initializing,

engines/ep/tests/module_tests/dcp_test.cc

@@ -396,91 +396,6 @@ TEST_F(DCPTest, MB30189_addStats) {
             nullptr);
 }
 
-TEST_F(DCPTest, MB34280) {
-    create_dcp_producer();
-    const std::string name = producer->getName();
-    const std::size_t max = ConnHandler::MaxDcpStatNameLength;
-
-    auto validator = [&max](const std::string& name, std::string key) {
-        auto idx = key.find(name);
-        ASSERT_EQ(0, idx) << "Key: [" << key << "] does not start with ["
-                          << name << "]";
-        if (key.at(idx + name.length()) == ':') {
-            idx++;
-        }
-
-        auto v = key.substr(idx + name.length());
-        EXPECT_GT(max, v.size())
-                << "DCP stat key [" << v << "] exceeds the max limit of " << max
-                << " characters";
-    };
-
-    // Verify that the normal DCP producer stats don't exceed the max dcp stat
-    // name
-    producer->addStats(
-            [&name, validator](std::string_view key,
-                               std::string_view value,
-                               const void* ctx) {
-                validator(name, std::string{key.data(), key.size()});
-            },
-            cookie);
-
-    // Verify that the normal DCP consumer stats don't exceed the max dcp stat
-    // name
-    const std::string consumer_name = "test_consumer";
-    std::unique_ptr<DcpConsumer> consumer = std::make_unique<DcpConsumer>(
-            *engine, cookie, consumer_name, consumer_name);
-    consumer->addStats(
-            [name = consumer_name, validator](std::string_view key,
-                                              std::string_view value,
-                                              const void* ctx) {
-                validator(name, std::string{key.data(), key.size()});
-            },
-            cookie);
-
-    // Verify that the vbucket stream related DCP stats don't exceed the max
-    // dcp stat name
-    setup_dcp_stream(0,
-                     IncludeValue::Yes,
-                     IncludeXattrs::Yes,
-                     {{"enable_sync_writes", "true"},
-                      {"consumer_name", "test_consumer"}});
-
-    stream->addStats(
-            [&name, &max](std::string_view key,
-                          std::string_view value,
-                          const void* ctx) {
-                std::string k{key.data(), key.size()};
-                auto idx = k.find(name);
-                ASSERT_EQ(0, idx) << "Key: [" << key
-                                  << "] does not start with [" << name << "]";
-                if (k.at(idx + name.length()) == ':') {
-                    idx++;
-                }
-                k = k.substr(idx + name.length());
-
-                // The stream operates on vbucket 0, lets use 1024 instead
-                idx = k.find("_0_");
-                ASSERT_NE(std::string::npos, idx)
-                        << "DCP stream stat [" << k
-                        << "] does not contain _0_ for vbucket 0";
-                auto v = k.substr(0, idx);
-                v.append("_1024_");
-                v.append(k.substr(idx + 3));
-                EXPECT_GT(max, v.size()) << "DCP stat key [" << v
-                                         << "] exceeds the max limit of " << max
-                                         << " characters";
-            },
-            cookie);
-
-    EXPECT_EQ(cb::engine_errc::no_such_key, destroy_dcp_stream());
-
-    stream.reset();
-    vb0.reset();
-    producer.reset();
-    consumer.reset();
-}
-
 std::string decompressValue(std::string compressedValue) {
     cb::compression::Buffer buffer;
     if (!cb::compression::inflate(cb::compression::Algorithm::Snappy,

include/memcached/limits.h

@@ -24,7 +24,4 @@ constexpr std::size_t TotalBuckets = cb::ArenaMallocMaxClients;
 /// users in a document
 constexpr std::size_t PrivilegedBytes = 1024 * 1024;
 
-/// The maximum length of a DCP connection
-constexpr std::size_t MaxDcpName = 200;
-
 } // namespace cb::limits

tests/mcbp/mcbp_dcp_test.cc

@@ -72,13 +72,6 @@ TEST_P(DcpOpenValidatorTest, Value) {
     EXPECT_EQ(cb::mcbp::Status::Einval, validate());
 }
 
-TEST_P(DcpOpenValidatorTest, MB34280_NameTooLongKeylen) {
-    auto blen = request.getBodylen() - request.getKeylen();
-    request.setKeylen(201);
-    request.setBodylen(blen + 201);
-    EXPECT_EQ(cb::mcbp::Status::Einval, validate());
-}
-
 TEST_P(DcpOpenValidatorTest, Pitr) {
     cb::mcbp::RequestBuilder builder({blob, sizeof(blob)}, true);
     using cb::mcbp::request::DcpOpenPayload;