]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #20735 into master
authorSage Weil <sage@redhat.com>
Tue, 6 Nov 2018 13:24:14 +0000 (07:24 -0600)
committerSage Weil <sage@redhat.com>
Tue, 6 Nov 2018 13:24:14 +0000 (07:24 -0600)
* 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>
1  2 
src/msg/async/Stack.cc

index 8e2d1ec13ac8797cebbcde609245447fb0839cd7,b2c4b28820d58eb3371c60ac9b951618945a376b..8976c3cc43a85addd16eee72a8e0df3167a1ea16
@@@ -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 "