Revert "Add support for enabling xattr support"

This reverts commit 45ab791.

We're going to encode the (presence and length) of xattrs as
part of the flex meta field. By doing so we should enable the
knowledge of them by using HELO with XATTR support (this is the
same way we'll be enabling collection aware flex meta to be
encoded in GetWithMeta and SetWithMeta).

This means that we no longer need the control message.

Change-Id: I3d28e720a8eb0b673b1eec0453599789d14766b8
Reviewed-on: http://review.couchbase.org/68917
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Daniel Owen <owend@couchbase.com>

Author: trondn

src/dcp/producer.cc

@@ -551,8 +551,8 @@ ENGINE_ERROR_CODE DcpProducer::control(uint32_t opaque, const void* key,
                                        uint32_t nvalue) {
     lastReceiveTime = ep_current_time();
     const char* param = static_cast<const char*>(key);
-    const std::string keyStr(static_cast<const char*>(key), nkey);
-    const std::string valueStr(static_cast<const char*>(value), nvalue);
+    std::string keyStr(static_cast<const char*>(key), nkey);
+    std::string valueStr(static_cast<const char*>(value), nvalue);
 
     if (strncmp(param, "connection_buffer_size", nkey) == 0) {
         uint32_t size;
@@ -614,13 +614,6 @@ ENGINE_ERROR_CODE DcpProducer::control(uint32_t opaque, const void* key,
             priority.assign("low");
             return ENGINE_SUCCESS;
         }
-    } else if (keyStr == "enable_xattr_support") {
-        const bool enable = valueStr == "true";
-        engine_.getServerApi()->cookie->set_dcp_xattr_support(getCookie(),
-                                                              enable);
-        LOG(EXTENSION_LOG_INFO, "%s %s xattr support", logHeader(),
-            enable ? "enable" : "disable");
-        return ENGINE_SUCCESS;
     }
 
     LOG(EXTENSION_LOG_WARNING, "%s Invalid ctrl parameter '%s' for %s",

tests/ep_testsuite_dcp.cc

@@ -5426,35 +5426,6 @@ static enum test_result test_set_dcp_param(ENGINE_HANDLE *h,
     return SUCCESS;
 }
 
-static enum test_result test_set_dcp_xattr(ENGINE_HANDLE *h,
-                                           ENGINE_HANDLE_V1 *h1)
-{
-    const auto *cookie = testHarness.create_cookie();
-    const std::string name("test_set_dcp_xattr");
-    uint32_t opaque = 0;
-    checkeq(ENGINE_SUCCESS,
-            h1->dcp.open(h, cookie, opaque, 0, DCP_OPEN_PRODUCER,
-                         (void*)name.data(), uint16_t(name.size())),
-            "Failed dcp producer open connection.");
-    const std::string param_name("enable_xattr_support");
-    const std::string enable("true");
-    const std::string disable("false");
-    checkeq(ENGINE_SUCCESS,
-            h1->dcp.control(h, cookie, ++opaque,
-                            param_name.c_str(), uint16_t(param_name.size()),
-                            enable.c_str(), uint16_t(enable.size())),
-            "Failed to enable xattr support");
-
-    checkeq(ENGINE_SUCCESS,
-            h1->dcp.control(h, cookie, ++opaque,
-                            param_name.c_str(), uint16_t(param_name.size()),
-                            disable.c_str(), uint16_t(enable.size())),
-            "Failed to disable xattr support");
-    testHarness.destroy_cookie(cookie);
-
-    return SUCCESS;
-}
-
 // Test manifest //////////////////////////////////////////////////////////////
 
 const char *default_dbname = "./ep_testsuite_dcp";
@@ -5698,7 +5669,5 @@ BaseTestCase testsuite_testcases[] = {
         TestCase("test_set_dcp_param",
                  test_set_dcp_param, test_setup, teardown, NULL,
                  prepare, cleanup),
-        TestCase("test enable dcp xattr", test_set_dcp_xattr, test_setup,
-                 teardown, nullptr, prepare, cleanup),
         TestCase(NULL, NULL, NULL, NULL, NULL, prepare, cleanup)
 };