]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoosdc/Objecter: unify disparate EAGAIN handling paths into one 16627/head
Sage Weil [Thu, 27 Jul 2017 16:13:39 +0000 (12:13 -0400)]
osdc/Objecter: unify disparate EAGAIN handling paths into one

We had two different code paths for EAGAIN that both
seemed to resend the same request again (with a new
tid), but implemneted it in two different ways. Further,
the first one was conditioned on the BALANCE_READS
flag but not LOCALIZED_READS, which should (I think) be
equivalent in this context.

Unify them into a single path.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16384 from mikulely/2-checkout-placmenet-target-existness
Yuri Weinstein [Thu, 27 Jul 2017 14:29:13 +0000 (07:29 -0700)]
Merge pull request #16384 from mikulely/2-checkout-placmenet-target-existness

rgw: check placement target existence during bucket creation

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #16389 from prallabh/wip-20661
Yuri Weinstein [Thu, 27 Jul 2017 14:27:37 +0000 (07:27 -0700)]
Merge pull request #16389 from prallabh/wip-20661

rgw: Do not decrement stats cache when the cache values are zero

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #16463 from cbodley/wip-20708
Yuri Weinstein [Thu, 27 Jul 2017 14:25:50 +0000 (07:25 -0700)]
Merge pull request #16463 from cbodley/wip-20708

rgw: fix parse/eval of policy conditions with IfExists

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #16495 from weiqiaomiao/wip_weiqm_rgw_crash
Yuri Weinstein [Thu, 27 Jul 2017 14:22:59 +0000 (07:22 -0700)]
Merge pull request #16495 from weiqiaomiao/wip_weiqm_rgw_crash

rgw: fix radosgw will crash when service is restarted during lifecycl…

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
7 years agoMerge pull request #16531 from rzarzynski/wip-rgw-20757
Yuri Weinstein [Thu, 27 Jul 2017 14:19:22 +0000 (07:19 -0700)]
Merge pull request #16531 from rzarzynski/wip-rgw-20757

rgw: fix memory leaks during Swift Static Website's error handling.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #16601 from rzarzynski/wip-rgw-20774
Yuri Weinstein [Thu, 27 Jul 2017 14:18:42 +0000 (07:18 -0700)]
Merge pull request #16601 from rzarzynski/wip-rgw-20774

rgw: never let http_redirect_code of RGWRedirectInfo to stay uninitialized

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
7 years agoMerge pull request #16604 from rzarzynski/wip-rgw-20779
Yuri Weinstein [Thu, 27 Jul 2017 14:17:32 +0000 (07:17 -0700)]
Merge pull request #16604 from rzarzynski/wip-rgw-20779

rgw: fix the UTF8 check on bucket entry name in rgw_log_op().

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #16575 from liewegas/wip-20693
Sage Weil [Thu, 27 Jul 2017 13:31:53 +0000 (08:31 -0500)]
Merge pull request #16575 from liewegas/wip-20693

qa/suites/rados: at-end: ignore PG_{AVAILABILITY,DEGRADED}

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #16398 from dillaman/wip-20655
Jason Dillaman [Thu, 27 Jul 2017 12:27:39 +0000 (08:27 -0400)]
Merge pull request #16398 from dillaman/wip-20655

rbd-mirror: guard the deletion of non-primary images

Reviewed-by: Venky Shankar <vshankar@redhat.com>
7 years agoMerge pull request #16574 from batrick/rgw-rbd-stripped-build
Kefu Chai [Thu, 27 Jul 2017 05:10:07 +0000 (13:10 +0800)]
Merge pull request #16574 from batrick/rgw-rbd-stripped-build

CMakeLists: trim rbd/rgw forced dependencies

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16603 from dillaman/wip-rbd-mirror-valgrind
Venky Shankar [Thu, 27 Jul 2017 02:54:28 +0000 (08:24 +0530)]
Merge pull request #16603 from dillaman/wip-rbd-mirror-valgrind

rbd-mirror: initialize timer context pointer to null

7 years agoMerge pull request #16613 from liewegas/wip-vstart-mgr
Sage Weil [Thu, 27 Jul 2017 02:04:25 +0000 (21:04 -0500)]
Merge pull request #16613 from liewegas/wip-vstart-mgr

vstart.sh: start mgr after mon, before osds

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #16584 from gregsfortytwo/wip-deletes-coverity
Jos Collin [Thu, 27 Jul 2017 01:11:01 +0000 (01:11 +0000)]
Merge pull request #16584 from gregsfortytwo/wip-deletes-coverity

messages: default-initialize MOSDPGRecoveryDelete[Reply] members

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agovstart.sh: start mgr after mon, before osds 16613/head
Sage Weil [Wed, 26 Jul 2017 21:22:25 +0000 (17:22 -0400)]
vstart.sh: start mgr after mon, before osds

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16610 from dzafman/wip-fix-reg11184
David Zafman [Wed, 26 Jul 2017 18:42:15 +0000 (11:42 -0700)]
Merge pull request #16610 from dzafman/wip-fix-reg11184

test: reg11184 might not always find pg 2.0 prior to import

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16530 from xiexingguo/wip-fix-pgtemp
Sage Weil [Wed, 26 Jul 2017 18:09:33 +0000 (13:09 -0500)]
Merge pull request #16530 from xiexingguo/wip-fix-pgtemp

mon: prime pg_temp and a few health warning fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16587 from dzafman/wip-20770
David Zafman [Wed, 26 Jul 2017 17:53:16 +0000 (10:53 -0700)]
Merge pull request #16587 from dzafman/wip-20770

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16600 from dingdangzhang/master
Kefu Chai [Wed, 26 Jul 2017 17:03:12 +0000 (01:03 +0800)]
Merge pull request #16600 from dingdangzhang/master

bluestore/BlueFS: pass string as const ref

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16563 from hjwsm1989/readable-thread-info
Kefu Chai [Wed, 26 Jul 2017 17:00:31 +0000 (01:00 +0800)]
Merge pull request #16563 from hjwsm1989/readable-thread-info

common/WorkQueue: use threadpoolname + threadaddr for heartbeat_han…

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16576 from liewegas/wip-20371
Kefu Chai [Wed, 26 Jul 2017 17:00:07 +0000 (01:00 +0800)]
Merge pull request #16576 from liewegas/wip-20371

mon/MonClient: scale backoff interval down when we have a healthy mon session

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16559 from hjwsm1989/dump-stuck
Sage Weil [Wed, 26 Jul 2017 16:59:21 +0000 (11:59 -0500)]
Merge pull request #16559 from hjwsm1989/dump-stuck

qa/tasks/dump_stuck: fix dump_stuck test bug

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16516 from Liuchang0812/nit-close-formatter-section
Kefu Chai [Wed, 26 Jul 2017 16:55:05 +0000 (00:55 +0800)]
Merge pull request #16516 from Liuchang0812/nit-close-formatter-section

mon/MDSMonitor: close object section of formatter

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16553 from wumingqiao/wip-leveldb-store-crash
Kefu Chai [Wed, 26 Jul 2017 16:54:21 +0000 (00:54 +0800)]
Merge pull request #16553 from wumingqiao/wip-leveldb-store-crash

kv: resolve a crash issue in ~LevelDBStore()

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16578 from liewegas/wip-20771
Sage Weil [Wed, 26 Jul 2017 16:53:17 +0000 (11:53 -0500)]
Merge pull request #16578 from liewegas/wip-20771

common/common_init: disable default dout logging for UTILITY_NODOUT too

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16522 from majianpeng/bluestore-remove-unused-code
Kefu Chai [Wed, 26 Jul 2017 16:46:34 +0000 (00:46 +0800)]
Merge pull request #16522 from majianpeng/bluestore-remove-unused-code

os/bluestore/BlueStore: remove unused code.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agotest: reg11184 might not always find pg 2.0 prior to import 16610/head
David Zafman [Wed, 26 Jul 2017 16:46:15 +0000 (09:46 -0700)]
test: reg11184 might not always find pg 2.0 prior to import

Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #16571 from ceph/wip-cd-bluestore-2
Sage Weil [Wed, 26 Jul 2017 16:43:50 +0000 (11:43 -0500)]
Merge pull request #16571 from ceph/wip-cd-bluestore-2

qa/tasks/ceph-deploy: Fix bluestore options for ceph-deploy

Reviewed-by: Tamil Muthamizhan <tmuthami@redhat.com>
7 years agoMerge pull request #16452 from wjwithagen/wjw-warning-unused
Kefu Chai [Wed, 26 Jul 2017 15:19:57 +0000 (23:19 +0800)]
Merge pull request #16452 from wjwithagen/wjw-warning-unused

buffer: silence unused var warning on FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16483 from ddiss/cmake_install_includedir
Kefu Chai [Wed, 26 Jul 2017 15:19:05 +0000 (23:19 +0800)]
Merge pull request #16483 from ddiss/cmake_install_includedir

cmake: use CMAKE_INSTALL_INCLUDEDIR

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #15033 from rzarzynski/wip-rgw-19831
Casey Bodley [Wed, 26 Jul 2017 15:13:33 +0000 (11:13 -0400)]
Merge pull request #15033 from rzarzynski/wip-rgw-19831

rgw: fix segfault in RevokeThread during its shutdown procedure.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #16013 from xiexingguo/wip-blue-tool
Sage Weil [Wed, 26 Jul 2017 15:04:26 +0000 (10:04 -0500)]
Merge pull request #16013 from xiexingguo/wip-blue-tool

os/bluestore/bluestore_tool: add sanity check to get rid of occasionally crash

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16528 from tchaikov/wip-ceph-release-notes
Kefu Chai [Wed, 26 Jul 2017 15:03:01 +0000 (23:03 +0800)]
Merge pull request #16528 from tchaikov/wip-ceph-release-notes

tools: ceph-release-notes: escape _ for unintended links

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
7 years agoMerge pull request #16404 from dzafman/wip-20041
David Zafman [Wed, 26 Jul 2017 14:59:43 +0000 (07:59 -0700)]
Merge pull request #16404 from dzafman/wip-20041

osd: scrub_to specifies clone ver, but transaction include head write…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #16579 from liewegas/wip-fix-nonregression
Sage Weil [Wed, 26 Jul 2017 13:46:43 +0000 (08:46 -0500)]
Merge pull request #16579 from liewegas/wip-fix-nonregression

qa/suites/rados/singleton/all/erasure-code-nonregression: fix typo

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Amik Kumar <amitkuma@redhat.com>
7 years agoqa/workunits/erasure-code/encode-decode-nonregression: do not require git checkout 16579/head
Sage Weil [Wed, 26 Jul 2017 13:35:46 +0000 (09:35 -0400)]
qa/workunits/erasure-code/encode-decode-nonregression: do not require git checkout

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorgw: fix the UTF8 check on bucket entry name in rgw_log_op(). 16604/head
Radoslaw Zarzynski [Wed, 26 Jul 2017 13:25:36 +0000 (09:25 -0400)]
rgw: fix the UTF8 check on bucket entry name in rgw_log_op().

Fixes: http://tracker.ceph.com/issues/20779
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #16580 from liewegas/wip-20767
Sage Weil [Wed, 26 Jul 2017 13:24:00 +0000 (08:24 -0500)]
Merge pull request #16580 from liewegas/wip-20767

pybind/mgr/zabbix: fix health in non-compat mode

Reviewed-by: Wido den Hollander <wido@widodh.nl>
7 years agoMerge pull request #16573 from liewegas/wip-osd-manual
Alfredo Deza [Wed, 26 Jul 2017 13:19:17 +0000 (09:19 -0400)]
Merge pull request #16573 from liewegas/wip-osd-manual

doc/install/manual-deployment: update osd creation steps

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agorbd-mirror: initialize timer context pointer to null 16603/head
Jason Dillaman [Wed, 26 Jul 2017 12:52:24 +0000 (08:52 -0400)]
rbd-mirror: initialize timer context pointer to null

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years ago bluestore/BlueFS: pass string as const ref 16600/head
dingdangzhang [Wed, 26 Jul 2017 12:05:01 +0000 (20:05 +0800)]
 bluestore/BlueFS: pass string as const ref

Signed-off-by: dingdangzhang <boqian.zy@alibaba-inc.com>
7 years agotest: Fixes for test_pidfile 16587/head
David Zafman [Wed, 26 Jul 2017 01:39:56 +0000 (18:39 -0700)]
test: Fixes for test_pidfile

Add a short delay for one test
Fix test that had unreliable log output

Fixes: http://tracker.ceph.com/issues/20770
Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agorgw: rgw_website.h doesn't assume inclusion of the std namespace anymore. 16601/head
Radoslaw Zarzynski [Wed, 26 Jul 2017 12:16:11 +0000 (08:16 -0400)]
rgw: rgw_website.h doesn't assume inclusion of the std namespace anymore.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agorgw: never let http_redirect_code of RGWRedirectInfo to stay uninitialized.
Radoslaw Zarzynski [Wed, 26 Jul 2017 12:12:30 +0000 (08:12 -0400)]
rgw: never let http_redirect_code of RGWRedirectInfo to stay uninitialized.

Fixes: http://tracker.ceph.com/issues/20774
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #14868 from wangzhengyong/librbd
Jason Dillaman [Wed, 26 Jul 2017 12:00:57 +0000 (08:00 -0400)]
Merge pull request #14868 from wangzhengyong/librbd

librbd: add compare and write API

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librbd: fixed compiler warnings
Jason Dillaman [Wed, 26 Jul 2017 11:42:30 +0000 (07:42 -0400)]
test/librbd: fixed compiler warnings

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librbd: improved compare_and_write testing
Jason Dillaman [Wed, 26 Jul 2017 11:41:52 +0000 (07:41 -0400)]
test/librbd: improved compare_and_write testing

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librbd: add compare_and_write test for fsx
wangzhengyong [Mon, 12 Jun 2017 13:25:32 +0000 (21:25 +0800)]
test/librbd: add compare_and_write test for fsx
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agotest/librbd: add compare_and_write testcase
wangzhengyong [Mon, 12 Jun 2017 13:25:12 +0000 (21:25 +0800)]
test/librbd: add compare_and_write testcase
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agotest/librbd: add Mock Image cache for compare_and_write
wangzhengyong [Mon, 12 Jun 2017 13:24:38 +0000 (21:24 +0800)]
test/librbd: add Mock Image cache for compare_and_write
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agotest/librbd: handle compare_and_write op in test_mock_Replay
wangzhengyong [Mon, 12 Jun 2017 13:24:04 +0000 (21:24 +0800)]
test/librbd: handle compare_and_write op in test_mock_Replay
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agolibrbd/journal: handle compare_and_write event
wangzhengyong [Mon, 12 Jun 2017 13:23:04 +0000 (21:23 +0800)]
librbd/journal: handle compare_and_write event
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agotest/librbd: handle cmpext request in LibradosTestStub
wangzhengyong [Mon, 12 Jun 2017 13:21:55 +0000 (21:21 +0800)]
test/librbd: handle cmpext request in LibradosTestStub
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agolibrbd: add compare_and_write/aio_compare_and_write API
wangzhengyong [Mon, 12 Jun 2017 13:18:29 +0000 (21:18 +0800)]
librbd: add compare_and_write/aio_compare_and_write API
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agolibrbd: add compare_and_write perfcounter
wangzhengyong [Mon, 12 Jun 2017 13:16:47 +0000 (21:16 +0800)]
librbd: add compare_and_write perfcounter
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agolibrbd: handle compare_and_write imagerequest in ImageRequestWQ
wangzhengyong [Mon, 12 Jun 2017 13:16:14 +0000 (21:16 +0800)]
librbd: handle compare_and_write imagerequest in ImageRequestWQ
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agolibrbd: add compare_and_write ImageRequest
wangzhengyong [Mon, 12 Jun 2017 13:14:19 +0000 (21:14 +0800)]
librbd: add compare_and_write ImageRequest
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agolibrbd: add CompareAndWrite ObjectRequest
wangzhengyong [Fri, 2 Jun 2017 07:41:23 +0000 (15:41 +0800)]
librbd: add CompareAndWrite ObjectRequest
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
7 years agoMerge pull request #16595 from wjwithagen/wip-wjw-freebsd-run-standalone
Sage Weil [Wed, 26 Jul 2017 11:58:37 +0000 (06:58 -0500)]
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>
7 years agomon/MonClient: do not send_log if conn is not active anymore 16576/head
Kefu Chai [Wed, 26 Jul 2017 05:54:58 +0000 (13:54 +0800)]
mon/MonClient: do not send_log if conn is not active anymore

the log message to be sent will be appended to waiting_for_session
instead. but we will send the logs anyway when the MonClient is
authorized with the new connection. so, avoid doing this as it's not
necessary.

also refactor the schedule_tick() call into a scope_guard, so it is
always called upon the return of the tick() method.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomon/MonClient: un-backoff on tick when we have a authenticated session
Sage Weil [Wed, 26 Jul 2017 11:53:20 +0000 (07:53 -0400)]
mon/MonClient: un-backoff on tick when we have a authenticated session

This means that if we do some backoff, then authenticate, and are healthy
for an extended period of time, a subsequent failure won't leave us
starting our hunting sequence with a large backoff.

Fixes: http://tracker.ceph.com/issues/20371
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/MonClient: factor un-backoff into helper; add missing config option
Sage Weil [Tue, 25 Jul 2017 22:41:53 +0000 (18:41 -0400)]
mon/MonClient: factor un-backoff into helper; add missing config option

- move this into a helper
- use the backoff factor for the division instead of hard-coding 2.0
- add a min config option instead of hard-coding 1.0

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa: make run-standalone work on FreeBSD 16595/head
Willem Jan Withagen [Wed, 26 Jul 2017 10:01:37 +0000 (12:01 +0200)]
qa: make run-standalone work on FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #16543 from dillaman/wip-service-daemon-c-api 16565/head
Kefu Chai [Wed, 26 Jul 2017 09:19:33 +0000 (17:19 +0800)]
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>
7 years agoMerge pull request #16519 from liewegas/wip-20754
Kefu Chai [Wed, 26 Jul 2017 09:17:24 +0000 (17:17 +0800)]
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>
7 years agoMerge pull request #16446 from xiexingguo/wip-destroyed
Kefu Chai [Wed, 26 Jul 2017 09:15:53 +0000 (17:15 +0800)]
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>
7 years agomon/OSDMonitor: introduce mon_osd_destroyed_out_interval for destroyed out control 16446/head
xie xingguo [Wed, 26 Jul 2017 07:18:49 +0000 (15:18 +0800)]
mon/OSDMonitor: introduce mon_osd_destroyed_out_interval for destroyed out control

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd/OSD: abort booting if osd is marked as destroyed
xie xingguo [Sat, 22 Jul 2017 02:30:05 +0000 (10:30 +0800)]
osd/OSD: abort booting if osd is marked as destroyed

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agomon/OSDMonitor: apply new 'destroyed' status to 'osd tree' filter
xie xingguo [Fri, 21 Jul 2017 07:08:44 +0000 (15:08 +0800)]
mon/OSDMonitor: apply new 'destroyed' status to 'osd tree' filter

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd/OSDMap: show "destroyed" status in tree view
xie xingguo [Fri, 21 Jul 2017 05:47:03 +0000 (13:47 +0800)]
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>
7 years agoMerge pull request #16123 from ddiss/fix-journal-supression
Kefu Chai [Wed, 26 Jul 2017 04:02:14 +0000 (12:02 +0800)]
Merge pull request #16123 from ddiss/fix-journal-supression

ceph-disk: don't activate suppressed journal devices

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agopybind/mgr/zabbix: fix health in non-compat mode 16580/head
Sage Weil [Wed, 26 Jul 2017 02:57:12 +0000 (22:57 -0400)]
pybind/mgr/zabbix: fix health in non-compat mode

This was apparently written/tested with mon_health_preluminous_compat
enabled.  Fix to behave with or without that option.

Fixes: http://tracker.ceph.com/issues/20767
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16498 from Songweibin/wip-doc-rbd-trash-cli
Sage Weil [Wed, 26 Jul 2017 02:49:26 +0000 (21:49 -0500)]
Merge pull request #16498 from Songweibin/wip-doc-rbd-trash-cli

doc: add rbd new trash cli and cleanups  in release-notes.rst

7 years agoMerge pull request #16552 from tchaikov/wip-doc-fixes
Sage Weil [Wed, 26 Jul 2017 02:48:12 +0000 (21:48 -0500)]
Merge pull request #16552 from tchaikov/wip-doc-fixes

doc: document mClock related options

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc/install/manual-deployment: update osd creation steps 16573/head
Sage Weil [Wed, 26 Jul 2017 02:41:52 +0000 (22:41 -0400)]
doc/install/manual-deployment: update osd creation steps

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16534 from liewegas/wip-20751
Sage Weil [Wed, 26 Jul 2017 02:31:47 +0000 (21:31 -0500)]
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>
7 years agoqa/suites/rados/singleton/all/erasure-code-nonregression: fix typo
Sage Weil [Wed, 26 Jul 2017 02:26:43 +0000 (22:26 -0400)]
qa/suites/rados/singleton/all/erasure-code-nonregression: fix typo

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agocommon/common_init: disable default dout logging for UTILITY_NODOUT too 16578/head
Sage Weil [Wed, 26 Jul 2017 02:20:06 +0000 (22:20 -0400)]
common/common_init: disable default dout logging for UTILITY_NODOUT too

This was broken in 4d06719f101f49019be25bd6137f72f2cb85bd5a.

Fixes: http://tracker.ceph.com/issues/20771
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16469 from xiexingguo/wip-fix-test
Sage Weil [Wed, 26 Jul 2017 02:04:22 +0000 (21:04 -0500)]
Merge pull request #16469 from xiexingguo/wip-fix-test

test: s/osd_objectstore_type/osd_objectstore

7 years agomessages: default-initialize MOSDPGRecoveryDelete[Reply] members 16584/head
Greg Farnum [Wed, 26 Jul 2017 01:37:59 +0000 (18:37 -0700)]
messages: default-initialize MOSDPGRecoveryDelete[Reply] members

This makes Coverity happy and is good practice, even though we do
a member-by-member initialization in the only place we create these messages.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
7 years agodoc: add new trash cli in rados-rbd-cmds.rst 16498/head
songweibin [Sat, 22 Jul 2017 07:09:25 +0000 (15:09 +0800)]
doc: add new trash cli in rados-rbd-cmds.rst

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agodoc: cleanups in release-notes.rst
songweibin [Sat, 22 Jul 2017 03:34:28 +0000 (11:34 +0800)]
doc: cleanups in release-notes.rst

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agoos/bluestore/BlueStore: remove unused code. 16522/head
Jianpeng Ma [Tue, 25 Jul 2017 23:03:51 +0000 (07:03 +0800)]
os/bluestore/BlueStore: remove unused code.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agoCMakeLists: trim rbd/rgw accidental dependencies 16574/head
Patrick Donnelly [Tue, 25 Jul 2017 21:30:46 +0000 (14:30 -0700)]
CMakeLists: trim rbd/rgw accidental dependencies

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa/suites/rados: at-end: ignore PG_{AVAILABILITY,DEGRADED} 16575/head
Sage Weil [Tue, 25 Jul 2017 22:29:07 +0000 (18:29 -0400)]
qa/suites/rados: at-end: ignore PG_{AVAILABILITY,DEGRADED}

With the peering deletes change, setting luminous sets the osdmap flag
which triggers a new peering interval.  That can lead to health warnings
about PG_AVAILABILITY or PG_DEGRADED.  Ignore those!

Fixes: http://tracker.ceph.com/issues/20693
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoAdd both filestore and bluestore options for tests 16571/head
Vasu Kulkarni [Tue, 25 Jul 2017 22:14:36 +0000 (15:14 -0700)]
Add both filestore and bluestore options for tests

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agoAdd ceph-deploy overrides options
Vasu Kulkarni [Tue, 25 Jul 2017 22:10:38 +0000 (15:10 -0700)]
Add ceph-deploy overrides options

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agoMerge pull request #15693 from dillaman/wip-osd-cmpext-ec-pool
Josh Durgin [Tue, 25 Jul 2017 20:52:20 +0000 (13:52 -0700)]
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>
7 years agoMerge pull request #16527 from jcsp/wip-options-followup
Sage Weil [Tue, 25 Jul 2017 20:48:45 +0000 (15:48 -0500)]
Merge pull request #16527 from jcsp/wip-options-followup

common: follow up to new options infrastructure

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16511 from c744402859/master
Yuri Weinstein [Tue, 25 Jul 2017 20:46:25 +0000 (13:46 -0700)]
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>
7 years agoMerge pull request #16560 from nrdmn/patch-3
Sage Weil [Tue, 25 Jul 2017 20:21:50 +0000 (15:21 -0500)]
Merge pull request #16560 from nrdmn/patch-3

pybind/mgr/restful: fix typo

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoFixed typo in src/pybind/mgr/restful/api/__init__.py 16560/head
nrdmn [Tue, 25 Jul 2017 11:30:44 +0000 (13:30 +0200)]
Fixed typo in src/pybind/mgr/restful/api/__init__.py

Signed-off-by: Nick Erdmann <n@nirf.de>
Fixed typo

7 years agobluestore config options for tests
Vasu Kulkarni [Tue, 25 Jul 2017 18:57:25 +0000 (11:57 -0700)]
bluestore config options for tests

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agoAdd bluestore overrides for ceph-deploy
Vasu Kulkarni [Tue, 25 Jul 2017 18:56:01 +0000 (11:56 -0700)]
Add bluestore overrides for ceph-deploy

ceph-deploy doesn't use ceph overrides, Add same overrides for ceph-deploy

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agoMove ceph-deploy config options into its own folder
Vasu Kulkarni [Tue, 25 Jul 2017 18:48:10 +0000 (11:48 -0700)]
Move ceph-deploy config options into its own folder

The old structure of link at top folder is pretty much outdated, the test
config option needs to be specific to cluster yaml.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agoAdd option to specify bluestore/filestore options
Vasu Kulkarni [Fri, 14 Jul 2017 21:24:29 +0000 (14:24 -0700)]
Add option to specify bluestore/filestore options

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agoMerge pull request #16536 from jdurgin/wip-20747
Sage Weil [Tue, 25 Jul 2017 19:05:15 +0000 (14:05 -0500)]
Merge pull request #16536 from jdurgin/wip-20747

osd: PrimaryLogPG, PGBackend: complete callback even if interval changes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16539 from jdurgin/wip-20753
Sage Weil [Tue, 25 Jul 2017 19:04:17 +0000 (14:04 -0500)]
Merge pull request #16539 from jdurgin/wip-20753

osd/PGLog: fix inaccurate missing assert

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16541 from liewegas/wip-20761
Sage Weil [Tue, 25 Jul 2017 19:03:38 +0000 (14:03 -0500)]
Merge pull request #16541 from liewegas/wip-20761

qa/workunits/cephtool/test.sh: disable 'fs status' until bug is fixed

7 years agoMerge pull request #16544 from dillaman/wip-service-daemon-null-dereference
Sage Weil [Tue, 25 Jul 2017 19:03:25 +0000 (14:03 -0500)]
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>