Compressor: Remove thread affinity options

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 04691b94b4664de12c47f865f3673ec1f5b0986f..ea885346dc81dcbbf899ef29eb76c61dd9dbdc9e 100644 (file)
--- 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 eafdf7c50fa634d93d7ac1a5ef52ee5b38ca1628..564d61473305fe0a26ef26afef5b5ee373d3b943 100644 (file)
--- 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<string> corestrs;
-  get_str_vec(cct->_conf->async_compressor_affinity_cores, corestrs);
-  for (vector<string>::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()