Merge branch 'wip-opslog-socket2' into next

Conflicts:
	src/rgw/rgw_main.cc

diff --cc src/Makefile.am
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/rgw/rgw_log.cc
Simple merge

diff --cc src/rgw/rgw_main.cc
index 5a4a8fc1a34ea47df625be8c68a3b0b47689bab1,4e87d64a497ce7b58bb03d19ebc7c67e6b4e0e65..5f52dde228d7205c10b00db6c6dc2a5f18502cf8
--- 1/src/rgw/rgw_main.cc
--- 2/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@@ -178,10 -186,10 +179,10 @@@ class RGWProcess 
    uint64_t max_req_id;
  
  public:
-   RGWProcess(CephContext *cct, RGWRados *rgwstore, int num_threads, RGWREST *_rest)
-     : store(rgwstore), m_tp(cct, "RGWProcess::m_tp", num_threads),
+   RGWProcess(CephContext *cct, RGWRados *rgwstore, OpsLogSocket *_olog, int num_threads, RGWREST *_rest)
+     : store(rgwstore), olog(_olog), m_tp(cct, "RGWProcess::m_tp", num_threads),
        req_throttle(cct, "rgw_ops", num_threads * 2),
 -      rest(_rest),
 +      rest(_rest), sock_fd(-1),
        req_wq(this, g_conf->rgw_op_thread_timeout,
             g_conf->rgw_op_thread_suicide_timeout, &m_tp),
        max_req_id(0) {}
@@@ -496,11 -486,15 +497,18 @@@ int main(int argc, const char **argv
      rest.register_resource(g_conf->rgw_admin_entry, admin_resource);
    }
  
-   pprocess = new RGWProcess(g_ceph_context, store, g_conf->rgw_thread_pool_size, &rest);
+   OpsLogSocket *olog = NULL;
+ 
+   if (!g_conf->rgw_ops_log_socket_path.empty()) {
+     olog = new OpsLogSocket(g_ceph_context, g_conf->rgw_ops_log_data_backlog);
+     olog->init(g_conf->rgw_ops_log_socket_path);
+   }
+ 
 -  RGWProcess process(g_ceph_context, store, olog, g_conf->rgw_thread_pool_size, &rest);
 -  process.run();
++  pprocess = new RGWProcess(g_ceph_context, store, olog, g_conf->rgw_thread_pool_size, &rest);
 +
 +  pprocess->run();
 +
 +  delete pprocess;
  
    if (do_swift) {
      swift_finalize();