From: Sage Weil <sage@redhat.com>
Date: Tue, 6 Nov 2018 13:24:14 +0000 (-0600)
Subject: Merge PR #20735 into master
X-Git-Tag: 3.2-0~8
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=05755fea768f9e73a7b8fcadb452d7e651a36e4e;p=ceph-ci.git

Merge PR #20735 into master

* refs/pull/20735/head:
	msg/async: fix variable type to make it same to EventCenter::init() incoming parameter type

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

05755fea768f9e73a7b8fcadb452d7e651a36e4e
diff --cc src/msg/async/Stack.cc
index 8e2d1ec13ac,b2c4b28820d..8976c3cc43a
--- a/src/msg/async/Stack.cc
+++ b/src/msg/async/Stack.cc
@@@ -103,9 -103,9 +103,9 @@@ Worker* NetworkStack::create_worker(Cep
  
  NetworkStack::NetworkStack(CephContext *c, const string &t): type(t), started(false), cct(c)
  {
 -  assert(cct->_conf->ms_async_op_threads > 0);
 +  ceph_assert(cct->_conf->ms_async_op_threads > 0);
  
-   const uint64_t InitEventNumber = 5000;
+   const int InitEventNumber = 5000;
    num_workers = cct->_conf->ms_async_op_threads;
    if (num_workers >= EventCenter::MAX_EVENTCENTER) {
      ldout(cct, 0) << __func__ << " max thread limit is "