MB-47318: [BP] Add disabled tests for the issue

Note: The original commit that the new tests were part of was reverted
due to a flaw in the accompanying fix.

This back-ported commit skips the flawed fix and just includes the
unit tests and supporting test code.

Change-Id: Iec0f35e37377280961b8f7d923c99c797ab2fdb8
Reviewed-on: https://review.couchbase.org/c/kv_engine/+/166226
Well-Formed: Restriction Checker
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: jimwwalker

protocol/connection/client_connection.cc

@@ -1625,7 +1625,8 @@ void MemcachedConnection::recvDcpBufferAck(uint32_t expected) {
         cb::mcbp::ClientOpcode::DcpBufferAcknowledgement) {
         throw std::logic_error(
                 "MemcachedConnection::recvDcpBufferAck not a buffer ack "
-                "opcode");
+                "opcode request:" +
+                request->toJSON(request->isValid()).dump());
     }
     auto* dcpBufferAck =
             reinterpret_cast<const cb::mcbp::request::DcpBufferAckPayload*>(

tests/testapp/CMakeLists.txt

@@ -36,6 +36,7 @@ set(memcached_testapp_SOURCES
     testapp_cmd_timers.cc
     testapp_collections.cc
     testapp_dcp.cc
+    testapp_dcp_consumer.cc
     testapp_durability.cc
     testapp_environment.cc
     testapp_environment.h

tests/testapp/testapp.cc

@@ -134,7 +134,7 @@ std::string to_string(ClientSnappySupport snappy) {
                            std::to_string(int(snappy)));
 }
 
-void TestappTest::CreateTestBucket() {
+void TestappTest::CreateTestBucket(const std::string& bucketConf) {
     auto& conn = connectionMap.getConnection(false);
 
     // Reconnect to the server so we know we're on a "fresh" connection
@@ -143,7 +143,7 @@ void TestappTest::CreateTestBucket() {
     conn.reconnect();
     conn.authenticate("@admin", "password", "PLAIN");
 
-    mcd_env->getTestBucket().setUpBucket(bucketName, "", conn);
+    mcd_env->getTestBucket().setUpBucket(bucketName, bucketConf, conn);
 
     // Reconnect the object to avoid others to reuse the admin creds
     conn.reconnect();
@@ -168,8 +168,13 @@ TestBucketImpl& TestappTest::GetTestBucket() {
 // Per-test-case set-up.
 // Called before the first test in this test case.
 void TestappTest::SetUpTestCase() {
+    doSetUpTestCaseWithConfiguration(generate_config(0));
+}
+
+void TestappTest::doSetUpTestCaseWithConfiguration(
+        nlohmann::json config, const std::string& bucketConf) {
     token = 0xdeadbeef;
-    memcached_cfg = generate_config(0);
+    memcached_cfg = std::move(config);
     start_memcached_server();
 
     if (HasFailure()) {
@@ -178,7 +183,7 @@ void TestappTest::SetUpTestCase() {
 
         exit(EXIT_FAILURE);
     } else {
-        CreateTestBucket();
+        CreateTestBucket(bucketConf);
     }
 }
 

tests/testapp/testapp.h

@@ -96,6 +96,12 @@ class TestappTest : public ::testing::Test {
     static cb::mcbp::Status sasl_auth(const char* username,
                                       const char* password);
 
+    /// Do the per-test-case set up with the provided configuration
+    /// (start the server with the provided configuration and define the
+    /// default bucket and terminate the process if we fail to do so)
+    static void doSetUpTestCaseWithConfiguration(
+            nlohmann::json config, const std::string& bucketConf = "");
+
     /// Helper which which returns true if the specified value is correctly
     /// encoded as JSON.
     static bool isJSON(cb::const_char_buffer value);
@@ -203,7 +209,7 @@ class TestappTest : public ::testing::Test {
     static void stop_memcached_server();
 
     // Create the bucket used for testing
-    static void CreateTestBucket();
+    static void CreateTestBucket(const std::string& bucketConf = "");
 
     // Delete the bucket used for testing.
     static void DeleteTestBucket();

tests/testapp/testapp_client_test.cc

@@ -35,7 +35,8 @@ MemcachedConnection& TestappClientTest::getConnection() {
 
 void TestappXattrClientTest::setBodyAndXattr(
         const std::string& startValue,
-        std::initializer_list<std::pair<std::string, std::string>> xattrList,
+        std::initializer_list<std::pair<const std::string, std::string>>
+                xattrList,
         bool compressValue) {
     document.info.flags = 0xcaffee;
     document.info.id = name;
@@ -45,17 +46,10 @@ void TestappXattrClientTest::setBodyAndXattr(
         // Combine the body and Extended Attribute into a single value -
         // this allows us to store already compressed documents which
         // have XATTRs.
-        cb::xattr::Blob xattrs;
-        for (auto& kv : xattrList) {
-            xattrs.set(kv.first, kv.second);
-        }
-        auto encoded = xattrs.finalize();
-        ASSERT_TRUE(cb::xattr::validate(encoded)) << "Invalid xattr encoding";
         document.info.cas = 10; // withMeta requires a non-zero CAS.
         document.info.datatype = cb::mcbp::Datatype::Xattr;
-        document.value = {reinterpret_cast<char*>(encoded.data()),
-                          encoded.size()};
-        document.value.append(startValue);
+        document.value =
+                cb::xattr::make_wire_encoded_string(startValue, xattrList);
         if (compressValue) {
             // Compress the complete body.
             document.compress();
@@ -95,7 +89,8 @@ void TestappXattrClientTest::setBodyAndXattr(
 
 void TestappXattrClientTest::setBodyAndXattr(
         const std::string& value,
-        std::initializer_list<std::pair<std::string, std::string>> xattrList) {
+        std::initializer_list<std::pair<const std::string, std::string>>
+                xattrList) {
     setBodyAndXattr(
             value, xattrList, hasSnappySupport() == ClientSnappySupport::Yes);
 }

tests/testapp/testapp_client_test.h

@@ -114,7 +114,7 @@ class TestappXattrClientTest : public TestappTest,
      */
     void setBodyAndXattr(
             const std::string& startValue,
-            std::initializer_list<std::pair<std::string, std::string>>
+            std::initializer_list<std::pair<const std::string, std::string>>
                     xattrList,
             bool compressValue);
 
@@ -127,7 +127,7 @@ class TestappXattrClientTest : public TestappTest,
      */
     void setBodyAndXattr(
             const std::string& value,
-            std::initializer_list<std::pair<std::string, std::string>>
+            std::initializer_list<std::pair<const std::string, std::string>>
                     xattrList);
 
     void setClusterSessionToken(uint64_t new_value);