From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 13 Jul 2016 21:36:39 +0000 (-0400)
Subject: rgw: mark asio frontend as experimental
X-Git-Tag: v11.1.0~454^2~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=81439138b6236137788bd7ec8a26892bd78cabdb;p=ceph.git

rgw: mark asio frontend as experimental

Users will need to set "rgw-asio-frontend" as an experimental
feature.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 67724fddc52..37ef78d9d2a 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -431,7 +431,8 @@ int main(int argc, const char **argv)
     RGWFrontendConfig *config = fiter->second;
     string framework = config->get_framework();
     RGWFrontend *fe;
-    if (framework == "asio") {
+    if ((framework == "asio") &&
+	cct->check_experimental_feature_enabled("rgw-asio-frontend")) {
       int port;
       config->get_val("port", 80, &port);
       RGWProcessEnv env{ store, &rest, olog, port };