]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoos/bluestore/BlueStore: Fix wrong usage of std::unique_lock for OpSequenecer 9279/head
Jianpeng Ma [Tue, 24 May 2016 09:22:32 +0000 (17:22 +0800)]
os/bluestore/BlueStore: Fix wrong usage of std::unique_lock for OpSequenecer

When set bluestore_sync_wal_apply = false, the osd must be crashed.
I add some debug message in WALWQ::_dequeue():
// preserve wal ordering for this sequencer by taking the lock
/ while still holding the queue lock
-      i->osr->wal_apply_lock.lock();
+      try {
+       i->osr->wal_apply_lock.lock();
+      } catch (const system_error& e) {
+       if (e.code() == std::errc::resource_deadlock_would_occur) {
+         assert(0 == "would deadlock");
+       } else
+         assert(0 == "other system_error");
+      }
       return i;
     }

2016-05-24 00:02:29.107165 7f0f32ea6700 -1 os/bluestore/BlueStore.h: In
function 'virtual BlueStore::TransContext* BlueStore::WALWQ::_dequeue()'
thread 7f0f32ea6700 time 2016-05-24 00:02:29.103360
os/bluestore/BlueStore.h: 489: FAILED assert(0 == "would deadlock")

 ceph version 10.2.0-1232-g21c7599 (21c759936ddcbfec50cf177a577206a2c443c212)
 1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x80) [0x560196215ac0]
 2: (ThreadPool::WorkQueue<BlueStore::TransContext>::_void_dequeue()+0x234)[0x560195e618b4]
 3: (ThreadPool::worker(ThreadPool::WorkThread*)+0x654) [0x560196207324]
 4: (ThreadPool::WorkThread::entry()+0x10) [0x560196208d70]
 5: (()+0x760a) [0x7f0f411d260a]
 6: (clone()+0x6d) [0x7f0f3f17a59d]
 NOTE: a copy of the executable, or `objdump -rdS <executable>` is
needed to interpret this.

This because the wron usage of std::unique_lock.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoMerge branch 'xio-rename_XioRsp' of https://github.com/Adirl/ceph into Adirl-xio...
Matt Benjamin [Mon, 23 May 2016 23:00:03 +0000 (19:00 -0400)]
Merge branch 'xio-rename_XioRsp' of https://github.com/Adirl/ceph into Adirl-xio-rename_XioRsp

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #9235 from athanatos/wip-throttle
Josh Durgin [Mon, 23 May 2016 22:02:41 +0000 (15:02 -0700)]
Merge pull request #9235 from athanatos/wip-throttle

BackoffThrottle: fix for freebsd and avoid spinning when full

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #9276 from linuxbox2/xio-enqueue-2
Matt Benjamin [Mon, 23 May 2016 21:24:17 +0000 (17:24 -0400)]
Merge pull request #9276 from linuxbox2/xio-enqueue-2

xio: follow 03d33e59 (enqueue_for_send()->enqueue())

9 years agoxio: follow 03d33e59 (enqueue_for_send()->enqueue()) 9276/head
Matt Benjamin [Mon, 23 May 2016 21:22:38 +0000 (17:22 -0400)]
xio: follow 03d33e59 (enqueue_for_send()->enqueue())

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #9275 from ktdreyer/wip-doc-cephfs-jcsp
Gregory Farnum [Mon, 23 May 2016 21:21:33 +0000 (14:21 -0700)]
Merge pull request #9275 from ktdreyer/wip-doc-cephfs-jcsp

doc: John Spray is now CephFS lead

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agodoc: John Spray is now CephFS lead 9275/head
Ken Dreyer [Mon, 23 May 2016 21:17:55 +0000 (15:17 -0600)]
doc: John Spray is now CephFS lead

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #8856 from avnerbh/fixes_4_keepalive_to_xio
Matt Benjamin [Mon, 23 May 2016 21:12:45 +0000 (17:12 -0400)]
Merge pull request #8856 from avnerbh/fixes_4_keepalive_to_xio

xio: provide keepalive(s) and their ack(s)

9 years agoMerge pull request #9171 from weiqiaomiao/wqm-wip-rgw-mem
Casey Bodley [Mon, 23 May 2016 20:55:15 +0000 (16:55 -0400)]
Merge pull request #9171 from weiqiaomiao/wqm-wip-rgw-mem

rgw: fix some memory leak

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #8873 from roidayan/xio-use_xio_session_event_str
Matt Benjamin [Mon, 23 May 2016 20:26:39 +0000 (16:26 -0400)]
Merge pull request #8873 from roidayan/xio-use_xio_session_event_str

xio: use accelio api to get event str

(this is a decision for the Accelio API, we need to follow it)

9 years agoMerge pull request #9205 from Adirl/fix_compiltaion_entity_addr_t3
Matt Benjamin [Mon, 23 May 2016 20:24:34 +0000 (16:24 -0400)]
Merge pull request #9205 from Adirl/fix_compiltaion_entity_addr_t3

Fix compiltaion entity addr t

9 years agoMerge pull request #9229 from oritwas/wip-15937
Casey Bodley [Mon, 23 May 2016 20:07:09 +0000 (16:07 -0400)]
Merge pull request #9229 from oritwas/wip-15937

rgw: add missing metadata_heap pool to old zones

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoBackoffThrottle: wait() if past max 9235/head
Samuel Just [Wed, 18 May 2016 19:09:10 +0000 (12:09 -0700)]
BackoffThrottle: wait() if past max

Otherwise, we risk spinning on wait_for() with a small
delay.

Fixes: http://tracker.ceph.com/issues/15953
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoBackoffThrottle: use wait_for instead of wait_until
Samuel Just [Wed, 18 May 2016 18:49:19 +0000 (11:49 -0700)]
BackoffThrottle: use wait_for instead of wait_until

On some platforms, wait_until won't surrender the lock
with a negative argument.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9249 from tchaikov/wip-cmake-ocf
Casey Bodley [Mon, 23 May 2016 14:53:15 +0000 (10:53 -0400)]
Merge pull request #9249 from tchaikov/wip-cmake-ocf

cmake: add ocf support

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9227 from ceph/rpm-autosetup-kdreyer
Boris Ranto [Mon, 23 May 2016 14:34:42 +0000 (16:34 +0200)]
Merge pull request #9227 from ceph/rpm-autosetup-kdreyer

ceph.spec.in: use %autosetup macro

Reviewed-by: Nathan Cuthler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #9147 from flaf/master
Kefu Chai [Mon, 23 May 2016 14:20:54 +0000 (22:20 +0800)]
Merge pull request #9147 from flaf/master

doc: update required packages list to build doc

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9247 from cxwshawn/wip-tc4-fix
Sage Weil [Mon, 23 May 2016 13:51:27 +0000 (09:51 -0400)]
Merge pull request #9247 from cxwshawn/wip-tc4-fix

global: optimize header file dependency.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9251 from cxwshawn/wip-tc5-fix
Sage Weil [Mon, 23 May 2016 13:50:50 +0000 (09:50 -0400)]
Merge pull request #9251 from cxwshawn/wip-tc5-fix

client: optimize header file dependency.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoosd/HitSet.h: add 'override' to virtual functionsReviewed-by: Kefu Chai <kchai@redhat...
Sage Weil [Mon, 23 May 2016 13:50:13 +0000 (09:50 -0400)]
osd/HitSet.h: add 'override' to virtual functionsReviewed-by: Kefu Chai <kchai@redhat.com>

osd/HitSet.h: add 'override' to virtual functions

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9255 from yuyuyu101/wip-test-msgr-fix
Sage Weil [Mon, 23 May 2016 13:48:56 +0000 (09:48 -0400)]
Merge pull request #9255 from yuyuyu101/wip-test-msgr-fix

test_msgr: add verbose info for pending connections

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8929 from ajarr/wip-15614
John Spray [Mon, 23 May 2016 11:34:30 +0000 (12:34 +0100)]
Merge pull request #8929 from ajarr/wip-15614

ceph_volume_client: allow read-only authorization for volumes

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoceph_volume_client: allow read-only authorization for volumes 8929/head
Ramana Raja [Wed, 27 Apr 2016 17:56:44 +0000 (23:26 +0530)]
ceph_volume_client: allow read-only authorization for volumes

Allow clients to be restricted to read-only mount of the volume
by restricting their ceph auth ID's MDS and OSD caps to read-only.

Fixes: http://tracker.ceph.com/issues/15614
Signed-off-by: Ramana Raja <rraja@redhat.com>
9 years agoMerge pull request #8473 from rjfd/wip-14421
Jason Dillaman [Sun, 22 May 2016 20:14:18 +0000 (16:14 -0400)]
Merge pull request #8473 from rjfd/wip-14421

rbd-mirror: Delete local image mirror when remote image mirroring is disabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: test: added image-deleter test case when mirroring is disabled
Ricardo Dias [Fri, 13 May 2016 15:47:25 +0000 (16:47 +0100)]
rbd-mirror: test: added image-deleter test case when mirroring is disabled

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirror: Unregister clients from non-primary images journal
Ricardo Dias [Fri, 13 May 2016 15:44:53 +0000 (16:44 +0100)]
rbd-mirror: Unregister clients from non-primary images journal

A non-primary image may have registered clients on its journal
(for instance a primary image that was later demoted). We must
unregister the clients when disabling image mirroring with the
force option.

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirror: test: Added unit test for testing image-deleter thread
Ricardo Dias [Tue, 19 Apr 2016 11:35:49 +0000 (12:35 +0100)]
rbd-mirror: test: Added unit test for testing image-deleter thread

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirror: test: Fixed test_PoolWatcher to support the new changes in PoolWatcher...
Ricardo Dias [Mon, 18 Apr 2016 11:22:19 +0000 (12:22 +0100)]
rbd-mirror: test: Fixed test_PoolWatcher to support the new changes in PoolWatcher class

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirror: Replayer: bootstrap existing mirrored images
Ricardo Dias [Tue, 5 Apr 2016 08:47:32 +0000 (09:47 +0100)]
rbd-mirror: Replayer: bootstrap existing mirrored images

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirror: replayer: Added image-deleter thread to replayer
Ricardo Dias [Thu, 28 Apr 2016 10:49:43 +0000 (11:49 +0100)]
rbd-mirror: replayer: Added image-deleter thread to replayer

Fixes: http://tracker.ceph.com/issues/14421
Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirror: Added image-deleter thread to rbd-mirror
Ricardo Dias [Thu, 28 Apr 2016 10:48:05 +0000 (11:48 +0100)]
rbd-mirror: Added image-deleter thread to rbd-mirror

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirror: Added implementation of image-deleter thread
Ricardo Dias [Wed, 13 Apr 2016 14:17:40 +0000 (15:17 +0100)]
rbd-mirror: Added implementation of image-deleter thread

image-deleter thread will handle the deletion of local images that have
been disabled for mirroring by the primary site.

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agoMerge pull request #9179 from vshankar/rbd-min-commit-position
Jason Dillaman [Sun, 22 May 2016 19:45:11 +0000 (15:45 -0400)]
Merge pull request #9179 from vshankar/rbd-min-commit-position

cls_journal: initialize empty commit position upon client register

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7836 from yuyuyu101/wip-13938
Jason Dillaman [Sun, 22 May 2016 19:44:53 +0000 (15:44 -0400)]
Merge pull request #7836 from yuyuyu101/wip-13938

TaskFinisher: use singleton SafeTimer and Finisher

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest_msgr: add verbose info for pending connections 9255/head
Haomai Wang [Sun, 22 May 2016 15:43:47 +0000 (23:43 +0800)]
test_msgr: add verbose info for pending connections

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoclient: optimize header file dependency. 9251/head
cxwshawn [Sun, 22 May 2016 07:04:46 +0000 (15:04 +0800)]
client: optimize header file dependency.

same work as https://github.com/ceph/ceph/pull/9247

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agoosd/HitSet.h: add 'override' to virtual functions 9253/head
Michal Jarzabek [Sat, 21 May 2016 21:24:44 +0000 (22:24 +0100)]
osd/HitSet.h: add 'override' to virtual functions

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoosdc/Objecter: move C_TwoContexts class to cc fileReviewed-by: Sage Weil <sage@redhat...
Sage Weil [Sat, 21 May 2016 20:29:39 +0000 (16:29 -0400)]
osdc/Objecter: move C_TwoContexts class to cc fileReviewed-by: Sage Weil <sage@redhat.com>

osdc/Objecter: move C_TwoContexts class to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoosdc/Objecter: move C_TwoContexts class to cc file 9250/head
Michal Jarzabek [Sat, 21 May 2016 14:46:18 +0000 (15:46 +0100)]
osdc/Objecter: move C_TwoContexts class to cc file

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agocmake: add ocf support 9249/head
Kefu Chai [Sat, 21 May 2016 12:45:55 +0000 (20:45 +0800)]
cmake: add ocf support

a new option is added: WITH_OCF. it is OFF by default.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoglobal: optimize header file dependency. 9247/head
chenxiaowei [Sat, 21 May 2016 03:48:32 +0000 (04:48 +0100)]
global: optimize header file dependency.

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agoMerge pull request #9241 from ceph/wip-fix-q-tests
Samuel Just [Fri, 20 May 2016 22:32:09 +0000 (15:32 -0700)]
Merge pull request #9241 from ceph/wip-fix-q-tests

common/: fix tests for prioritized_queue and wpq

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9102 from yehudasa/wip-rgw-leak-4
Yehuda Sadeh [Fri, 20 May 2016 22:30:44 +0000 (15:30 -0700)]
Merge pull request #9102 from yehudasa/wip-rgw-leak-4

rgw: don't unregister request if request is not connected to manager

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agocommon/: fix tests for prioritized_queue and wpq 9241/head
Samuel Just [Fri, 20 May 2016 22:22:56 +0000 (15:22 -0700)]
common/: fix tests for prioritized_queue and wpq

Introduced: 27b6ec40b93c05fbaa228783e11e2fac8f1a1ee1
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9216 from dzafman/wip-test-fix
Sage Weil [Fri, 20 May 2016 18:06:05 +0000 (14:06 -0400)]
Merge pull request #9216 from dzafman/wip-test-fix

test: Disable tests due to recovery race

9 years agotest: Disable tests due to recovery race 9216/head
David Zafman [Fri, 20 May 2016 05:22:09 +0000 (22:22 -0700)]
test: Disable tests due to recovery race

Disable:
osd-scrub-repair.sh
test-erasure-eio.sh
test-erasure-code.sh

These test are failing due to race conditions that is exposing
bug http://tracker.ceph.com/issues/13937.

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #9211 from dillaman/wip-15938
Mykola Golub [Fri, 20 May 2016 17:52:42 +0000 (20:52 +0300)]
Merge pull request #9211 from dillaman/wip-15938

librbd: write-after-write might result in an inconsistent replicated image

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9231 from athanatos/wip-recovery-wq
Sage Weil [Fri, 20 May 2016 17:26:02 +0000 (13:26 -0400)]
Merge pull request #9231 from athanatos/wip-recovery-wq

osd: Put background recovery tasks in the main OpWQ

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6208 from liewegas/wip-alloc-hints
Sage Weil [Fri, 20 May 2016 17:00:09 +0000 (13:00 -0400)]
Merge pull request #6208 from liewegas/wip-alloc-hints

librados,osd: rados hints for future access pattern

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7070 from majianpeng/headerbeatmap-check
Sage Weil [Fri, 20 May 2016 16:59:35 +0000 (12:59 -0400)]
Merge pull request #7070 from majianpeng/headerbeatmap-check

common/HeartbeatMap: print stack info of unhealth thread.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7843 from branch-predictor/bp-smart-async-wp
Sage Weil [Fri, 20 May 2016 16:59:16 +0000 (12:59 -0400)]
Merge pull request #7843 from branch-predictor/bp-smart-async-wp

msg/async: Implement smarter worker thread selection

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #8141 from songbaisen/song14
Sage Weil [Fri, 20 May 2016 16:58:36 +0000 (12:58 -0400)]
Merge pull request #8141 from songbaisen/song14

crush: fix the problem can not find the define item below the bucket

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8840 from tchaikov/wip-opt-u32
Sage Weil [Fri, 20 May 2016 16:57:53 +0000 (12:57 -0400)]
Merge pull request #8840 from tchaikov/wip-opt-u32

common/config: cast OPT_U32 options using uint32_t

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9072 from liewegas/wip-15840
Sage Weil [Fri, 20 May 2016 16:56:55 +0000 (12:56 -0400)]
Merge pull request #9072 from liewegas/wip-15840

osd: fix crush location update on startup

9 years agoMerge pull request #9116 from ddiss/librados_sparse_read_use_snapid
Sage Weil [Fri, 20 May 2016 16:56:21 +0000 (12:56 -0400)]
Merge pull request #9116 from ddiss/librados_sparse_read_use_snapid

librados: use caller provided snapid for aio_sparse_read()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #9002 from rzarzynski/wip-rgw-swift-acct_cont_md-fix
Orit Wasserman [Fri, 20 May 2016 16:02:26 +0000 (18:02 +0200)]
Merge pull request #9002 from rzarzynski/wip-rgw-swift-acct_cont_md-fix

rgw: fix updating account/container metadata of Swift API.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: add missing metadata_heap pool to old zones 9229/head
Orit Wasserman [Fri, 20 May 2016 07:52:01 +0000 (09:52 +0200)]
rgw: add missing metadata_heap pool to old zones

Fixes: http://tracker.ceph.com/issues/15937
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agocls_journal: Select min commit position for new clients 9179/head
Venky Shankar [Thu, 19 May 2016 17:15:34 +0000 (22:45 +0530)]
cls_journal: Select min commit position for new clients

When a new client registers, its commit position is initialized
to the least commit position of all other clients.

Fixes: http://tracker.ceph.com/issues/15757
Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agoMerge pull request #9225 from dachary/wip-run-make-check
Kefu Chai [Fri, 20 May 2016 13:46:29 +0000 (21:46 +0800)]
Merge pull request #9225 from dachary/wip-run-make-check

tests: rm -fr /tmp/*virtualenv*

Reviewed-by: Erwan Velu <erwan@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoceph.spec.in: use %autosetup macro 9227/head
Ken Dreyer [Fri, 20 May 2016 13:17:41 +0000 (07:17 -0600)]
ceph.spec.in: use %autosetup macro

New in rpm 4.11,
http://www.rpm.org/wiki/PackagerDocs/Autosetup

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #9165 from mikulely/fix-rgw-multisite-test
Casey Bodley [Fri, 20 May 2016 13:11:28 +0000 (09:11 -0400)]
Merge pull request #9165 from mikulely/fix-rgw-multisite-test

rgw: misc fix for test_multi.py

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agotests: rm -fr /tmp/*virtualenv* 9225/head
Loic Dachary [Fri, 20 May 2016 11:19:07 +0000 (13:19 +0200)]
tests: rm -fr /tmp/*virtualenv*

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #9139 from majianpeng/bluestore-statfs
Sage Weil [Fri, 20 May 2016 13:00:07 +0000 (09:00 -0400)]
Merge pull request #9139 from majianpeng/bluestore-statfs

os/bluestore/BlueStore: free space of bluestore should reduce spaces …

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9161 from cxwshawn/wip-tc1-fix
Sage Weil [Fri, 20 May 2016 12:32:33 +0000 (08:32 -0400)]
Merge pull request #9161 from cxwshawn/wip-tc1-fix

osd: optimize header file dependency to decreace compile time when modify any file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9193 from cxwshawn/wip-tc2-fix
Sage Weil [Fri, 20 May 2016 12:32:25 +0000 (08:32 -0400)]
Merge pull request #9193 from cxwshawn/wip-tc2-fix

mon: optimize header file dependency.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9068 from trociny/wip-pybind-rbd-mirror
Jason Dillaman [Fri, 20 May 2016 12:24:15 +0000 (08:24 -0400)]
Merge pull request #9068 from trociny/wip-pybind-rbd-mirror

librbd: initial python APIs to support mirroring

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9088 from trociny/wip-15500
Jason Dillaman [Fri, 20 May 2016 12:23:37 +0000 (08:23 -0400)]
Merge pull request #9088 from trociny/wip-15500

qa: dynamic_features.sh: return error only if it failed on alive QEMU

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9140 from zhouyuan/fix_disable_journaling
Jason Dillaman [Fri, 20 May 2016 12:22:56 +0000 (08:22 -0400)]
Merge pull request #9140 from zhouyuan/fix_disable_journaling

librbd: close journal before removing

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9177 from trociny/wip-15916
Jason Dillaman [Fri, 20 May 2016 12:21:14 +0000 (08:21 -0400)]
Merge pull request #9177 from trociny/wip-15916

rbd-mirror: it might got stuck in calculating "behind master" position

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: replay position might change after pruning stale tags 9211/head
Jason Dillaman [Thu, 19 May 2016 19:52:16 +0000 (15:52 -0400)]
journal: replay position might change after pruning stale tags

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: delay commit of overwritten journal event
Jason Dillaman [Thu, 19 May 2016 19:50:04 +0000 (15:50 -0400)]
librbd: delay commit of overwritten journal event

With the cache enabled and write-after-write IOs to the same
object extents, it was possible for the overwritten journal event
to be committed before the overwriter journal event was written
to disk.  If a client crash occurs before the event is written,
the image will be inconsistent on replay.

Fixes: http://tracker.ceph.com/issues/15938
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9196 from tchaikov/wip-cmake-vstart
John Spray [Fri, 20 May 2016 11:10:16 +0000 (12:10 +0100)]
Merge pull request #9196 from tchaikov/wip-cmake-vstart

cmake: add cython_rados to vstart target

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8164 from rzarzynski/wip-rgw-bulkdel-slashfix
Orit Wasserman [Fri, 20 May 2016 11:04:14 +0000 (13:04 +0200)]
Merge pull request #8164 from rzarzynski/wip-rgw-bulkdel-slashfix

rgw: handle initial slashes properly in BulkDelete of Swift API.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: handle initial slashes properly in BulkDelete of Swift API. 8164/head
Radoslaw Zarzynski [Tue, 15 Mar 2016 15:48:26 +0000 (16:48 +0100)]
rgw: handle initial slashes properly in BulkDelete of Swift API.

Fixes: http://tracker.ceph.com/issues/15948
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoMerge pull request #9220 from cxwshawn/wip-tc3-fix
Sage Weil [Fri, 20 May 2016 10:35:38 +0000 (06:35 -0400)]
Merge pull request #9220 from cxwshawn/wip-tc3-fix

auth: optimize header file dependency.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9212 from liewegas/wip-bit-alloc-test
Sage Weil [Fri, 20 May 2016 10:35:11 +0000 (06:35 -0400)]
Merge pull request #9212 from liewegas/wip-bit-alloc-test

tests: disable unittest_bit_alloc for now

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #9219 from renhwztetecs/renhw-wip-logmonitor-cleanup
Sage Weil [Fri, 20 May 2016 10:28:16 +0000 (06:28 -0400)]
Merge pull request #9219 from renhwztetecs/renhw-wip-logmonitor-cleanup

mon/log: clean unused function and comments

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agotest: file change affected by auth file header optimization. 9220/head
shawn [Fri, 20 May 2016 09:32:15 +0000 (05:32 -0400)]
test: file change affected by auth file header optimization.

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agoAUTH: optimize header file dependency.
shawn [Fri, 20 May 2016 08:39:29 +0000 (04:39 -0400)]
AUTH: optimize header file dependency.
same work as PR: https://github.com/ceph/ceph/pull/9193, https://github.com/ceph/ceph/pull/9161

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agomon/log: using standard macros instead of -1 9219/head
huanwen ren [Fri, 20 May 2016 08:41:39 +0000 (16:41 +0800)]
mon/log: using standard macros instead of -1

using standard macros instead of -1

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agomon/log: clean unused function and comments
huanwen ren [Fri, 20 May 2016 08:38:06 +0000 (16:38 +0800)]
mon/log: clean unused function and comments

clean unused function and comments

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agoMerge pull request #8656 from kmroz/wip-rgw-handler-cleanup-1
Orit Wasserman [Fri, 20 May 2016 08:30:25 +0000 (10:30 +0200)]
Merge pull request #8656 from kmroz/wip-rgw-handler-cleanup-1

rgw-rest: remove redundant virtual functions
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8886 from cbodley/wip-rgw-zone-short-ids
Orit Wasserman [Fri, 20 May 2016 08:28:08 +0000 (10:28 +0200)]
Merge pull request #8886 from cbodley/wip-rgw-zone-short-ids

rgw: check for short_zone_id collisions on period update
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9148 from rzarzynski/wip-rgw-15902
Orit Wasserman [Fri, 20 May 2016 08:23:22 +0000 (10:23 +0200)]
Merge pull request #9148 from rzarzynski/wip-rgw-15902

rgw: camelcase names of custom attributes in Swift's responses.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9042 from rzarzynski/wip-rgw-15812
Orit Wasserman [Fri, 20 May 2016 08:21:51 +0000 (10:21 +0200)]
Merge pull request #9042 from rzarzynski/wip-rgw-15812

rgw: handle errors properly during GET on Swift's DLO.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9149 from cbodley/wip-rgw-zone-modify-master
Orit Wasserman [Fri, 20 May 2016 08:19:23 +0000 (10:19 +0200)]
Merge pull request #9149 from cbodley/wip-rgw-zone-modify-master

rgw: add_zone only clears master_zone if --master=false
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9154 from yehudasa/wip-15886
Orit Wasserman [Fri, 20 May 2016 08:18:22 +0000 (10:18 +0200)]
Merge pull request #9154 from yehudasa/wip-15886

rgw: keep track of written_objs correctly
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9190 from dillaman/wip-15928
Mykola Golub [Fri, 20 May 2016 07:16:21 +0000 (10:16 +0300)]
Merge pull request #9190 from dillaman/wip-15928

librbd: metadata retrieval added to open image state machine

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9191 from dillaman/wip-15930
Mykola Golub [Fri, 20 May 2016 05:58:07 +0000 (08:58 +0300)]
Merge pull request #9191 from dillaman/wip-15930

rbd-mirror: disable librbd caching for replicated images

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9173 from dillaman/wip-15909
Mykola Golub [Fri, 20 May 2016 05:57:02 +0000 (08:57 +0300)]
Merge pull request #9173 from dillaman/wip-15909

rbd-mirror: potential crash during image status update

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #8983 from dzafman/wip-li-rados
Kefu Chai [Fri, 20 May 2016 04:36:44 +0000 (12:36 +0800)]
Merge pull request #8983 from dzafman/wip-li-rados

tools/rados: Improve list-inconsistent json format

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorgw: misc fix for test_multi.p 9165/head
Jiaying Ren [Tue, 17 May 2016 15:23:00 +0000 (23:23 +0800)]
rgw: misc fix for test_multi.p

remove redundent meta_checkpoint, cause realm.create_user(user) will
call meta_checkpoint by default(via wait_meta = True).

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
9 years agoTaskFinisher: use singleton SafeTimer and Finisher 7836/head
Haomai Wang [Sun, 28 Feb 2016 15:35:17 +0000 (23:35 +0800)]
TaskFinisher: use singleton SafeTimer and Finisher

Fix #13938
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoOSD: optimize header file dependency to decreace compile time when modify any file 9161/head
cxwshawn [Wed, 18 May 2016 03:53:52 +0000 (11:53 +0800)]
OSD: optimize header file dependency to decreace compile time when modify any file
    OSD's left header dependency optimize.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agoPG: optimize header file dependency to decreace compile time when modify any file
shawn [Tue, 17 May 2016 08:18:14 +0000 (04:18 -0400)]
PG: optimize header file dependency to decreace compile time when modify any file
PG Layer's header dependency optimize.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agoPGBackend: optimize header file dependency to decreace compile time when modify any...
shawn [Tue, 17 May 2016 06:14:01 +0000 (02:14 -0400)]
PGBackend: optimize header file dependency to decreace compile time when modify any file

hmm, everytime modify any file, then compile, then wait&wait&wait, so trying to optimize
this part, wish to decrease header dependency, try to improve compile speed.

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agotool: change affected file include relation by mon file header optimize 9193/head
shawn [Fri, 20 May 2016 02:37:49 +0000 (22:37 -0400)]
tool: change affected file include relation by mon file header optimize

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agoMON: optimize header file dependency.
cxwshawn [Thu, 19 May 2016 05:03:29 +0000 (13:03 +0800)]
MON: optimize header file dependency.

same work as PR: https://github.com/ceph/ceph/pull/9161

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agocrush: fix the problem that can not find the define item below the bucket 8141/head
songbaisen [Wed, 16 Mar 2016 02:55:47 +0000 (10:55 +0800)]
crush: fix the problem that can not find the define item below the bucket

Fixes: http://tracker.ceph.com/issues/15154
Signed-off-by: song baisen <song.baisen@zte.com.cn>
9 years agoMerge pull request #9108 from tchaikov/wip-13990
Samuel Just [Thu, 19 May 2016 23:08:32 +0000 (16:08 -0700)]
Merge pull request #9108 from tchaikov/wip-13990

osd: reset session->osdmap if waiting_for_pg is empty

Reviewed-by: Samuel Just <sjust@redhat.com>