From 0d2467a1ba03efa802c11c288daae11d12956b97 Mon Sep 17 00:00:00 2001 From: Haomai Wang Date: Mon, 27 Jul 2015 14:28:42 +0800 Subject: [PATCH] Compressor: Remove thread affinity options Signed-off-by: Haomai Wang --- src/common/config_opts.h | 5 ----- src/compressor/AsyncCompressor.cc | 11 ----------- 2 files changed, 16 deletions(-) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 04691b94b466..ea885346dc81 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -81,11 +81,6 @@ OPTION(xio_transport_type, OPT_STR, "rdma") // xio transport type: {rdma or tcp} OPTION(async_compressor_enabled, OPT_BOOL, false) OPTION(async_compressor_type, OPT_STR, "snappy") OPTION(async_compressor_threads, OPT_INT, 2) -OPTION(async_compressor_set_affinity, OPT_BOOL, true) -// example: ms_async_affinity_cores = 0,1 -// The number of coreset is expected to equal to ms_async_op_threads, otherwise -// extra op threads will loop ms_async_affinity_cores again. -OPTION(async_compressor_affinity_cores, OPT_STR, "") OPTION(async_compressor_thread_timeout, OPT_INT, 5) OPTION(async_compressor_thread_suicide_timeout, OPT_INT, 30) diff --git a/src/compressor/AsyncCompressor.cc b/src/compressor/AsyncCompressor.cc index eafdf7c50fa6..564d61473305 100644 --- a/src/compressor/AsyncCompressor.cc +++ b/src/compressor/AsyncCompressor.cc @@ -26,17 +26,6 @@ AsyncCompressor::AsyncCompressor(CephContext *c): compress_tp(g_ceph_context, "AsyncCompressor::compressor_tp", cct->_conf->async_compressor_threads, "async_compressor_threads"), job_lock("AsyncCompressor::job_lock"), compress_wq(this, c->_conf->async_compressor_thread_timeout, c->_conf->async_compressor_thread_suicide_timeout, &compress_tp) { - vector corestrs; - get_str_vec(cct->_conf->async_compressor_affinity_cores, corestrs); - for (vector::iterator it = corestrs.begin(); - it != corestrs.end(); ++it) { - string err; - int coreid = strict_strtol(it->c_str(), 10, &err); - if (err == "") - coreids.push_back(coreid); - else - lderr(cct) << __func__ << " failed to parse " << *it << " in " << cct->_conf->async_compressor_affinity_cores << dendl; - } } void AsyncCompressor::init() -- 2.47.3