Jason Dillaman
fb638155df
rbd-mirror: initialize timer context pointer to null
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-26 08:52:24 -04:00
Jason Dillaman
5d6eebcf26
Merge pull request #14868 from wangzhengyong/librbd
...
librbd: add compare and write API
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-07-26 08:00:57 -04:00
Jason Dillaman
d36cb4ec7e
test/librbd: fixed compiler warnings
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-26 08:00:06 -04:00
Jason Dillaman
5837977006
test/librbd: improved compare_and_write testing
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-26 08:00:06 -04:00
wangzhengyong
c8698edd54
test/librbd: add compare_and_write test for fsx
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:06 -04:00
wangzhengyong
52e3abd8b7
test/librbd: add compare_and_write testcase
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:06 -04:00
wangzhengyong
ad10d615e6
test/librbd: add Mock Image cache for compare_and_write
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:06 -04:00
wangzhengyong
da6bbe5ce6
test/librbd: handle compare_and_write op in test_mock_Replay
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:06 -04:00
wangzhengyong
971ff26ed2
librbd/journal: handle compare_and_write event
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:06 -04:00
wangzhengyong
5891b57a6f
test/librbd: handle cmpext request in LibradosTestStub
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:06 -04:00
wangzhengyong
e70d48933c
librbd: add compare_and_write/aio_compare_and_write API
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:06 -04:00
wangzhengyong
789c05336e
librbd: add compare_and_write perfcounter
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:06 -04:00
wangzhengyong
ead121bf9e
librbd: handle compare_and_write imagerequest in ImageRequestWQ
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:05 -04:00
wangzhengyong
d201c850de
librbd: add compare_and_write ImageRequest
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:05 -04:00
wangzhengyong
cd61316857
librbd: add CompareAndWrite ObjectRequest
...
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-26 08:00:05 -04:00
Sage Weil
fa1b19d9a5
Merge pull request #16595 from wjwithagen/wip-wjw-freebsd-run-standalone
...
qa: make run-standalone work on FreeBSD
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-26 06:58:37 -05:00
Willem Jan Withagen
ae88edd25d
qa: make run-standalone work on FreeBSD
...
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-26 12:01:37 +02:00
Kefu Chai
fb9a3e908a
Merge pull request #16543 from dillaman/wip-service-daemon-c-api
...
librados: add missing implementations for C service daemon API methods
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-26 17:19:33 +08:00
Kefu Chai
483efafb56
Merge pull request #16519 from liewegas/wip-20754
...
osd: populate last_epoch_split during build_initial_pg_history
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-07-26 17:17:24 +08:00
Kefu Chai
d85a7889fd
Merge pull request #16446 from xiexingguo/wip-destroyed
...
mon: show destroyed status in tree view; do not auto-out destroyed osds
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-26 17:15:53 +08:00
xie xingguo
1e867d757e
mon/OSDMonitor: introduce mon_osd_destroyed_out_interval for destroyed out control
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-26 15:18:49 +08:00
xie xingguo
c81097cfd9
osd/OSD: abort booting if osd is marked as destroyed
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-26 15:13:32 +08:00
xie xingguo
96eb0a9887
mon/OSDMonitor: apply new 'destroyed' status to 'osd tree' filter
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-26 15:13:32 +08:00
xie xingguo
3b6bbc416d
osd/OSDMap: show "destroyed" status in tree view
...
It would be a pain if we destroyed an osd and there is no obvious way
to find it out.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-26 15:13:32 +08:00
Kefu Chai
6ce96c7474
Merge pull request #16123 from ddiss/fix-journal-supression
...
ceph-disk: don't activate suppressed journal devices
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-26 12:02:14 +08:00
Sage Weil
f0b5900025
Merge pull request #16498 from Songweibin/wip-doc-rbd-trash-cli
...
doc: add rbd new trash cli and cleanups in release-notes.rst
2017-07-25 21:49:26 -05:00
Sage Weil
705676797a
Merge pull request #16552 from tchaikov/wip-doc-fixes
...
doc: document mClock related options
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-25 21:48:12 -05:00
Sage Weil
a3b4f08d20
Merge pull request #16534 from liewegas/wip-20751
...
mon/OSDMonitor: ensure UP is not set for newly-created OSDs
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-25 21:31:47 -05:00
Sage Weil
d2c31a8114
Merge pull request #16469 from xiexingguo/wip-fix-test
...
test: s/osd_objectstore_type/osd_objectstore
2017-07-25 21:04:22 -05:00
songweibin
34efaab49e
doc: add new trash cli in rados-rbd-cmds.rst
...
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-07-26 08:47:53 +08:00
songweibin
3860421425
doc: cleanups in release-notes.rst
...
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-07-26 08:47:35 +08:00
Josh Durgin
5a1f595bb3
Merge pull request #15693 from dillaman/wip-osd-cmpext-ec-pool
...
osd: support cmpext operation on EC-backed pools
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-07-25 13:52:20 -07:00
Sage Weil
b4b51d12ff
Merge pull request #16527 from jcsp/wip-options-followup
...
common: follow up to new options infrastructure
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-25 15:48:45 -05:00
Yuri Weinstein
65185cf09e
Merge pull request #16511 from c744402859/master
...
OSDMonitor: check mon_max_pool_pg_num when set pool pg_num
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-25 13:46:25 -07:00
Sage Weil
759da47c0c
Merge pull request #16560 from nrdmn/patch-3
...
pybind/mgr/restful: fix typo
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-25 15:21:50 -05:00
nrdmn
4f826e10d9
Fixed typo in src/pybind/mgr/restful/api/__init__.py
...
Signed-off-by: Nick Erdmann <n@nirf.de>
Fixed typo
2017-07-25 22:10:06 +02:00
Sage Weil
6ef3a8ed4d
Merge pull request #16536 from jdurgin/wip-20747
...
osd: PrimaryLogPG, PGBackend: complete callback even if interval changes
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-25 14:05:15 -05:00
Sage Weil
cbe92f1790
Merge pull request #16539 from jdurgin/wip-20753
...
osd/PGLog: fix inaccurate missing assert
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-25 14:04:17 -05:00
Sage Weil
a264725b62
Merge pull request #16541 from liewegas/wip-20761
...
qa/workunits/cephtool/test.sh: disable 'fs status' until bug is fixed
2017-07-25 14:03:38 -05:00
Sage Weil
af8d6bea5c
Merge pull request #16544 from dillaman/wip-service-daemon-null-dereference
...
mgr/MgrClient: do not attempt to access a global variable for config
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-25 14:03:25 -05:00
Casey Bodley
dfd5af27d3
Merge pull request #16385 from mikulely/3-check-target-when-create-bucket
...
rgw: check placement existence when create bucket
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-25 11:38:24 -04:00
Kefu Chai
70c1e5d4b0
Merge pull request #16540 from cbodley/wip-mrgw-admin-socket
...
rgw: restore admin socket path in mrgw.sh
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-25 23:19:01 +08:00
Sage Weil
d3e1c6c9b9
Merge pull request #16513 from liewegas/wip-standalone
...
qa: move ceph-helpers-based make check tests to qa/standalone; run via teuthology
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-25 09:51:36 -05:00
Sage Weil
4c2b8f29d5
Merge pull request #16566 from jcsp/wip-doc-health
...
doc/rados: add page for health checks and update monitoring.rst
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-25 09:36:49 -05:00
John Spray
5bf942570a
doc/rados: add page for health checks and update monitoring.rst
...
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-25 15:13:02 +01:00
Sage Weil
6a38a3548a
Merge pull request #16545 from asomers/install-deps
...
install-deps.sh: add missing dependencies for FreeBSD
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-25 09:00:02 -05:00
Sage Weil
65e0f2ce97
Merge pull request #16564 from liewegas/wip-vstart-mgr
...
vstart.sh: fix mgr vs restful command startup race
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2017-07-25 08:56:12 -05:00
Sage Weil
fc8e5e1c2f
ceph-disk/tests/ceph-disk.sh: wait for right number of pgs
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-25 09:51:22 -04:00
Sage Weil
0495efe624
vstart.sh: fix mgr vs restful command startup race
...
If the mgr hasn't activated yet we won't have registered the python
commands. Use 'ceph tell mgr ...' to ensure we block. (This is only a
problem right after mkfs when the first mgr hasn't started yet.)
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-25 09:20:29 -04:00
Jos Collin
0988a34ad1
Merge pull request #16497 from weiqiaomiao/wip_weiqm_rgw_compile_warn
...
rgw: Drop dump_usage_bucket_info() to silence warning from -Wunused-function
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-25 11:01:34 +00:00