RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jewel'

Browse Source
This commit is contained in:
Josh Durgin 2016-01-19 13:44:31 -08:00
commit 65a3fde9ab
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/workunits/rbd/qemu-iotests.sh
View File

@ -23,6 +23,10 @@ then
QEMU='/usr/bin/qemu-system-x86_64'
else
QEMU='/usr/libexec/qemu-kvm'
# disable test 055 since qemu-kvm (RHEL/CentOS) doesn't support the
# required QMP commands
testlist=$(echo ${testlist} | sed "s/ 055//g")
fi
ln -s $QEMU bin/qemu

3
src/librados/IoCtxImpl.cc
View File

@ -20,6 +20,7 @@
#include "librados/PoolAsyncCompletionImpl.h"
#include "librados/RadosClient.h"
#include "include/assert.h"
#include "common/valgrind.h"
#define dout_subsys ceph_subsys_rados
#undef dout_prefix
@ -1164,6 +1165,8 @@ int librados::IoCtxImpl::getxattrs(const object_t& oid,
void librados::IoCtxImpl::set_sync_op_version(version_t ver)
{
ANNOTATE_BENIGN_RACE_SIZED(&last_objver, sizeof(last_objver),
"IoCtxImpl last_objver");
last_objver = ver;
}

4
src/librbd/ExclusiveLock.cc
View File

@ -339,8 +339,8 @@ void ExclusiveLock<I>::send_acquire_lock() {
template <typename I>
void ExclusiveLock<I>::handle_acquiring_lock(int r) {
CephContext *cct = m_image_ctx.cct;
ldout(cct, 10) << this << " " << __func__ << dendl;
Mutex::Locker locker(m_lock);
ldout(m_image_ctx.cct, 10) << this << " " << __func__ << dendl;
assert(r == 0);
assert(m_state == STATE_ACQUIRING);

1
src/msg/simple/Pipe.cc
View File

@ -84,6 +84,7 @@ Pipe::Pipe(SimpleMessenger *r, int st, PipeConnection *con)
send_keepalive_ack(false),
connect_seq(0), peer_global_seq(0),
out_seq(0), in_seq(0), in_seq_acked(0) {
ANNOTATE_BENIGN_RACE_SIZED(&sd, sizeof(sd), "Pipe socket");
ANNOTATE_BENIGN_RACE_SIZED(&state, sizeof(state), "Pipe state");
ANNOTATE_BENIGN_RACE_SIZED(&recv_len, sizeof(recv_len), "Pipe recv_len");
ANNOTATE_BENIGN_RACE_SIZED(&recv_ofs, sizeof(recv_ofs), "Pipe recv_ofs");