From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 6 Apr 2018 01:10:40 +0000 (-0400)
Subject: rgw: beast frontend no longer experimental
X-Git-Tag: v13.1.0~338^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21272%2Fhead;p=ceph.git

rgw: beast frontend no longer experimental

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/rgw_frontend/beast.yaml b/qa/rgw_frontend/beast.yaml
index b0cf3830b670..369e65f7c7fe 100644
--- a/qa/rgw_frontend/beast.yaml
+++ b/qa/rgw_frontend/beast.yaml
@@ -1,7 +1,3 @@
 overrides:
   rgw:
     frontend: beast
-  ceph:
-    conf:
-      client:
-        enable experimental unrecoverable data corrupting features: "rgw-beast-frontend"
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index ac8c6e3cd3c2..e2fed3a3774a 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -468,8 +468,7 @@ int main(int argc, const char **argv)
       fe = new RGWLoadGenFrontend(env, config);
     }
 #if defined(WITH_RADOSGW_BEAST_FRONTEND)
-    else if ((framework == "beast") &&
-	cct->check_experimental_feature_enabled("rgw-beast-frontend")) {
+    else if (framework == "beast") {
       int port;
       config->get_val("port", 80, &port);
       std::string uri_prefix;