]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
common: OutputDataSocket retakes mutex on error path 29202/head
authorCasey Bodley <cbodley@redhat.com>
Thu, 6 Jun 2019 13:48:42 +0000 (09:48 -0400)
committerNathan Cutler <ncutler@suse.com>
Tue, 23 Jul 2019 12:59:40 +0000 (14:59 +0200)
commitd227ebcfea9e1c5c988d4ee1a178337ae4e5d338
treed64ea6f15e4fb716d66ad564398244a98b3f38a1
parentb69ff9a036318083ea121e2bc5da029a3222ac39
common: OutputDataSocket retakes mutex on error path

the list of buffers is protected by mutex m_lock. when dump_data() fails
and puts unwritten buffers back into the list, it needs to reaquire the
lock

Fixes: http://tracker.ceph.com/issues/40188
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 8645e24dd4fb3ecc9f02b34a1be916620b5f71b1)

Conflicts:
     src/common/OutputDataSocket.cc
- use Mutex::Locker instead of std::scoped_lock
src/common/OutputDataSocket.cc