From: Kefu Chai <kchai@redhat.com>
Date: Wed, 24 Feb 2021 05:02:43 +0000 (+0800)
Subject: msg/async: drop Stack::num_workers
X-Git-Tag: v16.2.15~8^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f2a811eb7ec804364397e29126c4e11a68ef893;p=ceph.git

msg/async: drop Stack::num_workers

no need to store it as a member variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 789c1bd62ae4863038afe9fcc014a47c292f02b7)
---

diff --git a/src/msg/async/Stack.cc b/src/msg/async/Stack.cc
index 7992e7395120..55c25f60f5e4 100644
--- a/src/msg/async/Stack.cc
+++ b/src/msg/async/Stack.cc
@@ -85,8 +85,17 @@ std::shared_ptr<NetworkStack> NetworkStack::create(CephContext *c,
     return nullptr;
   }
   
+  unsigned num_workers = c->_conf->ms_async_op_threads;
+  ceph_assert(num_workers > 0);
+  if (num_workers >= EventCenter::MAX_EVENTCENTER) {
+    ldout(c, 0) << __func__ << " max thread limit is "
+                  << EventCenter::MAX_EVENTCENTER << ", switching to this now. "
+                  << "Higher thread values are unnecessary and currently unsupported."
+                  << dendl;
+    num_workers = EventCenter::MAX_EVENTCENTER;
+  }
   const int InitEventNumber = 5000;
-  for (unsigned worker_id = 0; worker_id < stack->num_workers; ++worker_id) {
+  for (unsigned worker_id = 0; worker_id < num_workers; ++worker_id) {
     Worker *w = stack->create_worker(c, worker_id);
     int ret = w->center.init(InitEventNumber, worker_id, t);
     if (ret)
@@ -99,18 +108,7 @@ std::shared_ptr<NetworkStack> NetworkStack::create(CephContext *c,
 
 NetworkStack::NetworkStack(CephContext *c)
   : cct(c)
-{
-  ceph_assert(cct->_conf->ms_async_op_threads > 0);
-
-  num_workers = cct->_conf->ms_async_op_threads;
-  if (num_workers >= EventCenter::MAX_EVENTCENTER) {
-    ldout(cct, 0) << __func__ << " max thread limit is "
-                  << EventCenter::MAX_EVENTCENTER << ", switching to this now. "
-                  << "Higher thread values are unnecessary and currently unsupported."
-                  << dendl;
-    num_workers = EventCenter::MAX_EVENTCENTER;
-  }
-}
+{}
 
 void NetworkStack::start()
 {
diff --git a/src/msg/async/Stack.h b/src/msg/async/Stack.h
index eee4a3f9447a..3ce87975bf59 100644
--- a/src/msg/async/Stack.h
+++ b/src/msg/async/Stack.h
@@ -293,7 +293,6 @@ class Worker {
 };
 
 class NetworkStack {
-  unsigned num_workers = 0;
   ceph::spinlock pool_spin;
   bool started = false;