From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 12 Jan 2016 20:26:20 +0000 (-0500)
Subject: rgw: shorten name of RGWAsyncRadosProcessor thread pool
X-Git-Tag: v10.1.0~354^2~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=defb4d3ff2291a33f2e6b037d3ac3b923f8ea56d;p=ceph.git

rgw: shorten name of RGWAsyncRadosProcessor thread pool

threads now call pthread_setname_np(), and have to enforce a
16-character limit on the names. this fixes the assertion:

ceph/src/common/Thread.cc: 156: FAILED assert(strlen(name) < 16)

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

diff --git a/src/rgw/rgw_cr_rados.cc b/src/rgw/rgw_cr_rados.cc
index 83b9808be0b5..90a168a22f77 100644
--- a/src/rgw/rgw_cr_rados.cc
+++ b/src/rgw/rgw_cr_rados.cc
@@ -50,9 +50,9 @@ void RGWAsyncRadosProcessor::RGWWQ::_dump_queue() {
 
 RGWAsyncRadosProcessor::RGWAsyncRadosProcessor(RGWRados *_store, int num_threads)
   : store(_store), m_tp(store->ctx(), "RGWAsyncRadosProcessor::m_tp", "rados_async", num_threads),
-  req_throttle(store->ctx(), "rgw_async_rados_ops", num_threads * 2),
-  req_wq(this, g_conf->rgw_op_thread_timeout,
-         g_conf->rgw_op_thread_suicide_timeout, &m_tp) {
+    req_throttle(store->ctx(), "rgw_async_rados_ops", num_threads * 2),
+    req_wq(this, g_conf->rgw_op_thread_timeout,
+    g_conf->rgw_op_thread_suicide_timeout, &m_tp) {
 }
 
 void RGWAsyncRadosProcessor::start() {