RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15890 from tchaikov/wip-19741

Browse Source 
osdc/Objecter: release message if it's not handled

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Sage Weil 2017-06-24 23:20:38 -05:00 committed by GitHub
commit 82fcdd9175
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/ceph_crypto.cc
View File

@ -60,7 +60,7 @@ void ceph::crypto::init(CephContext *cct)
memset(&init_params, 0, sizeof(init_params));
init_params.length = sizeof(init_params);
uint32_t flags = NSS_INIT_READONLY;
uint32_t flags = (NSS_INIT_READONLY | NSS_INIT_PK11RELOAD);
if (cct->_conf->nss_db_path.empty()) {
flags |= (NSS_INIT_NOCERTDB | NSS_INIT_NOMODDB);
}

4
src/osdc/Objecter.h
View File

@ -2083,7 +2083,9 @@ private:
}
}
void ms_fast_dispatch(Message *m) override {
ms_dispatch(m);
if (!ms_dispatch(m)) {
m->put();
}
}
void handle_osd_op_reply(class MOSDOpReply *m);