]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agomgr/dashboard: Improve auth interceptor. 20847/head
Volker Theile [Fri, 16 Mar 2018 10:10:01 +0000 (11:10 +0100)]
mgr/dashboard: Improve auth interceptor.

In case of an error the response must be returned.

Signed-off-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #20970 from ashishkumsingh/doc-fix-resharding-formatting
Jos Collin [Thu, 22 Mar 2018 05:54:41 +0000 (11:24 +0530)]
Merge pull request #20970 from ashishkumsingh/doc-fix-resharding-formatting

doc: Fix dynamic resharding doc formatting

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #20978 from votdev/improve_formatter
Ricardo Dias [Wed, 21 Mar 2018 15:18:51 +0000 (15:18 +0000)]
Merge pull request #20978 from votdev/improve_formatter

mgr/dashboard: Add toBytes() method to FormatterService

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #20941 from dillaman/wip-dashboard-rbd
Ricardo Dias [Wed, 21 Mar 2018 15:09:26 +0000 (15:09 +0000)]
Merge pull request #20941 from dillaman/wip-dashboard-rbd

mgr/dashboard: additional fixes to block pages

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
7 years agomgr/dashboard: Add toBytes() method to FormatterService. 20978/head
Volker Theile [Tue, 20 Mar 2018 16:23:22 +0000 (17:23 +0100)]
mgr/dashboard: Add toBytes() method to FormatterService.

Signed-off-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #20977 from smithfarm/wip-23424
Nathan Cutler [Wed, 21 Mar 2018 09:03:43 +0000 (10:03 +0100)]
Merge pull request #20977 from smithfarm/wip-23424

cmake: add chrono to BOOST_COMPONENTS

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20969 from smithfarm/wip-23238
Nathan Cutler [Wed, 21 Mar 2018 09:03:03 +0000 (10:03 +0100)]
Merge pull request #20969 from smithfarm/wip-23238

osd: fix s390x build failure

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #20966 from dillaman/wip-23399
Mykola Golub [Wed, 21 Mar 2018 06:03:05 +0000 (08:03 +0200)]
Merge pull request #20966 from dillaman/wip-23399

rbd: children list should support snapshot id optional

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agocmake: add chrono to BOOST_COMPONENTS 20977/head
Nathan Cutler [Tue, 20 Mar 2018 14:59:59 +0000 (15:59 +0100)]
cmake: add chrono to BOOST_COMPONENTS

According to https://github.com/ceph/ceph/commit/9535165149d16a2a944a81f4888d3ab0a7358027
Boost::chrono is a dependency of Boost::context and Boost::thread,
but Boost::chrono does not get built unless it is included here.

Fixes: http://tracker.ceph.com/issues/23424
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #20958 from votdev/remove_useless_code
Lenz Grimmer [Tue, 20 Mar 2018 14:36:52 +0000 (15:36 +0100)]
Merge pull request #20958 from votdev/remove_useless_code

mgr/dashboard: Remove useless code

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agorbd: listing children now supports a snapshot id optional 20966/head
Jason Dillaman [Tue, 20 Mar 2018 04:32:00 +0000 (12:32 +0800)]
rbd: listing children now supports a snapshot id optional

Fixes: http://tracker.ceph.com/issues/23399
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoosd: fix s390x build failure 20969/head
Nathan Cutler [Tue, 20 Mar 2018 08:28:24 +0000 (09:28 +0100)]
osd: fix s390x build failure

46de629c3d0bfae5eba3f6b810808938b5a9af1f introduced a regression: on big-endian
machines, there was no matching function for call to 'eversion_t::encode(const
version_t&, ceph::bufferlist&) const' and 'eversion_t::decode(version_t&,
ceph::buffer::list::iterator&)'

Fixes: http://tracker.ceph.com/issues/23238
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agodoc: Fixes dynamic-resharding doc formatting 20970/head
Ashish Singh [Tue, 20 Mar 2018 08:49:32 +0000 (14:19 +0530)]
doc: Fixes dynamic-resharding doc formatting

Fixed the formatting errors in dynamicresharding.rst

Signed-off-by: Ashish Singh assingh@redhat.com
7 years agoMerge pull request #20888 from majianpeng/fix-vstop
Mykola Golub [Tue, 20 Mar 2018 08:48:52 +0000 (10:48 +0200)]
Merge pull request #20888 from majianpeng/fix-vstop

stop.sh: add ceph configure file location

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agopybind/rbd: added 'set_snap_by_id' API method
Jason Dillaman [Tue, 20 Mar 2018 04:09:46 +0000 (12:09 +0800)]
pybind/rbd: added 'set_snap_by_id' API method

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: added '(rbd_)snap_set_by_id' API methods
Jason Dillaman [Tue, 20 Mar 2018 03:53:22 +0000 (11:53 +0800)]
librbd: added '(rbd_)snap_set_by_id' API methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: internally utilize snap id when setting snapshot
Jason Dillaman [Tue, 20 Mar 2018 03:13:34 +0000 (23:13 -0400)]
librbd: internally utilize snap id when setting snapshot

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agostop.sh: specify the ceph.conf path to avoid using wrong ceph.conf. 20888/head
Jianpeng Ma [Mon, 19 Mar 2018 17:14:41 +0000 (01:14 +0800)]
stop.sh: specify the ceph.conf path to avoid using wrong ceph.conf.

Also specify the ceph.conf path for ceph-conf command in vstart.sh.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agoMerge pull request #20876 from smithfarm/wip-doc-license
Nathan Cutler [Mon, 19 Mar 2018 13:29:54 +0000 (14:29 +0100)]
Merge pull request #20876 from smithfarm/wip-doc-license

legal: remove doc license ambiguity

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
7 years agoMerge pull request #20898 from tspmelo/wip-nodejs-improvement
Ricardo Dias [Mon, 19 Mar 2018 12:30:45 +0000 (12:30 +0000)]
Merge pull request #20898 from tspmelo/wip-nodejs-improvement

mgr/dashboard: remove node/npm system installation

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: Remove useless code. 20958/head
Volker Theile [Mon, 19 Mar 2018 10:28:50 +0000 (11:28 +0100)]
mgr/dashboard: Remove useless code.

Signed-off-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #20784 from theanalyst/docs/release-reorg
Abhishek L [Mon, 19 Mar 2018 10:22:37 +0000 (11:22 +0100)]
Merge pull request #20784 from theanalyst/docs/release-reorg

doc: reorganize releases

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #20909 from tchaikov/wip-23370
Kefu Chai [Mon, 19 Mar 2018 08:54:41 +0000 (16:54 +0800)]
Merge pull request #20909 from tchaikov/wip-23370

mgr/MgrClient: guard send_pgstats() with lock

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20874 from sebastian-philipp/dashboard_v2-source-run-api-tests
Ricardo Dias [Mon, 19 Mar 2018 07:59:08 +0000 (07:59 +0000)]
Merge pull request #20874 from sebastian-philipp/dashboard_v2-source-run-api-tests

mgr/dashboard: Allow sourcing `run-backend-api-tests.sh`

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #20931 from ashitakasam/fix-typo
Jos Collin [Mon, 19 Mar 2018 04:56:28 +0000 (10:26 +0530)]
Merge pull request #20931 from ashitakasam/fix-typo

doc: s/deamon/daemon/

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agodoc: 'daemon' is misspelled in doc/cephfs/health-messages.rst and src/tools/rbd_recov... 20931/head
ashitakasam [Fri, 16 Mar 2018 02:51:23 +0000 (10:51 +0800)]
doc: 'daemon' is misspelled in doc/cephfs/health-messages.rst and src/tools/rbd_recover_tool/README

Signed-off-by: ashitakasam <694240887@qq.com>
7 years agoMerge remote-tracking branch 'gh/mimic-dev2'
Sage Weil [Sun, 18 Mar 2018 23:39:46 +0000 (18:39 -0500)]
Merge remote-tracking branch 'gh/mimic-dev2'

7 years agoMerge pull request #20944 from liewegas/wip-23339
Sage Weil [Sun, 18 Mar 2018 22:19:11 +0000 (17:19 -0500)]
Merge pull request #20944 from liewegas/wip-23339

osd: make scrub wait for ec read/modify/writes to apply

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoosd/ReplciatedBackend: do not op_applied on zeroed eversion_t 20944/head
Sage Weil [Sun, 18 Mar 2018 07:30:07 +0000 (02:30 -0500)]
osd/ReplciatedBackend: do not op_applied on zeroed eversion_t

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: wait for pushes and last_update_applied before requesting replica scrub
Sage Weil [Sat, 17 Mar 2018 19:50:27 +0000 (14:50 -0500)]
osd/PG: wait for pushes and last_update_applied before requesting replica scrub

Wait on the primary for the EC backend to finish r/m/w cycles before we
ask the replicas to scrub.  Otherwise we will wait on the primary but the
replicas will scrub immediately and we'll get a mismatched result!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/ECBackend: do not op_applied on zero at_version for dummy rollforward transaction
Sage Weil [Sat, 17 Mar 2018 16:20:06 +0000 (11:20 -0500)]
osd/ECBackend: do not op_applied on zero at_version for dummy rollforward transaction

The dummy rollforward transactions have at_version=0'0; do not call
op_applied on those.

This ensures that the op_applied call

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20948 from liewegas/wip-ecsubread-decode
Sage Weil [Sat, 17 Mar 2018 23:06:05 +0000 (18:06 -0500)]
Merge pull request #20948 from liewegas/wip-ecsubread-decode

osd/ECMsgTypes: fix ECSubRead compat decode

Reviewed-by: Myna Vajha <mynaramana@gmail.com>
7 years agoMerge pull request #20939 from dillaman/wip-cls-rbd-group
Mykola Golub [Sat, 17 Mar 2018 20:16:03 +0000 (22:16 +0200)]
Merge pull request #20939 from dillaman/wip-cls-rbd-group

cls/rbd: group_image_list incorrectly flagged as RW

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge PR #20903 into master
Patrick Donnelly [Sat, 17 Mar 2018 18:30:23 +0000 (11:30 -0700)]
Merge PR #20903 into master

* refs/pull/20903/head:
PendingReleaseNotes: add note about upgrading MDS

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoPendingReleaseNotes: add note about upgrading MDS 20903/head
Patrick Donnelly [Wed, 14 Mar 2018 22:30:12 +0000 (15:30 -0700)]
PendingReleaseNotes: add note about upgrading MDS

Fixes: https://tracker.ceph.com/issues/23172
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoosd/ECMsgTypes: fix ECSubRead compat decode 20948/head
Sage Weil [Fri, 16 Mar 2018 22:47:55 +0000 (17:47 -0500)]
osd/ECMsgTypes: fix ECSubRead compat decode

Populate subchunks based on to_read, not attrs_to_read.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoPartial revert "osd/PG: drop scrub machinery to wait for last_updated_applied"
Sage Weil [Fri, 16 Mar 2018 19:57:35 +0000 (14:57 -0500)]
Partial revert "osd/PG: drop scrub machinery to wait for last_updated_applied"

This reverts commit c489112a1dbcbb63024ba9c8c0abff6ef0c815d8 (well,
part of it).

We want the scrub machinery that will wait on an EC read/modify/write
until it has been queued with the ObjectStore, but we don't need the
parts that used to worry about queued but unapplied writes in FileStore
not being visible.

Fixes: http://tracker.ceph.com/issues/23339
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: restore op_applied in PGBackend
Sage Weil [Fri, 16 Mar 2018 19:57:27 +0000 (14:57 -0500)]
osd/PrimaryLogPG: restore op_applied in PGBackend

Call it when we queue the submitted write.  For ReplicatedPG this is
inside submit_transaction(), and for ECBackend it's when we finally
submit the write for disk (possibly delayed by a read/modify/write).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoRevert "osd/PG: remove last_updated_applied, op_applied()"
Sage Weil [Fri, 16 Mar 2018 19:02:49 +0000 (14:02 -0500)]
Revert "osd/PG: remove last_updated_applied, op_applied()"

This reverts commit c1c495f09754986772c28c9cc7414609572a385c.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #20879 into wip-sage-testing-20180316.201311
Sage Weil [Fri, 16 Mar 2018 20:13:19 +0000 (15:13 -0500)]
Merge PR #20879 into wip-sage-testing-20180316.201311

* refs/pull/20879/head:
qa/rgw: disable s3tests for lifecycle_expiration

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
7 years agomgr/dashboard: block mirroring page should show Ceph version 20941/head
Jason Dillaman [Fri, 16 Mar 2018 16:04:11 +0000 (12:04 -0400)]
mgr/dashboard: block mirroring page should show Ceph version

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agomgr/dashboard: avoid stale path data in block iSCSI status
Jason Dillaman [Fri, 16 Mar 2018 16:03:15 +0000 (12:03 -0400)]
mgr/dashboard: avoid stale path data in block iSCSI status

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agomgr/dashboard: block iSCSI frontend tweaks
Jason Dillaman [Fri, 16 Mar 2018 14:53:43 +0000 (10:53 -0400)]
mgr/dashboard: block iSCSI frontend tweaks

Label rates w/ "/s" suffix and switch throughput back to the
sparkline graph from dashboard v1.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20911 from guzhongyan/ConfM-cleanup
Kefu Chai [Fri, 16 Mar 2018 16:36:10 +0000 (00:36 +0800)]
Merge pull request #20911 from guzhongyan/ConfM-cleanup

mon/ConfigMonitor: clean up prepare_command()

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20914 from ibmibmibm/patch-1
Kefu Chai [Fri, 16 Mar 2018 16:35:30 +0000 (00:35 +0800)]
Merge pull request #20914 from ibmibmibm/patch-1

os/memstore: Fix wrong use of lock_guard

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20930 from badone/wip-Log-delete_type_mismatch
Kefu Chai [Fri, 16 Mar 2018 16:34:29 +0000 (00:34 +0800)]
Merge pull request #20930 from badone/wip-Log-delete_type_mismatch

log: Fix AddressSanitizer: new-delete-type-mismatch

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agowa/standalong/mon/osd-pool-create: debug and increase delay
Sage Weil [Tue, 27 Feb 2018 22:30:16 +0000 (16:30 -0600)]
wa/standalong/mon/osd-pool-create: debug and increase delay

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/ECMsgTypes: print subchunks in ECSubRead operator<<
Sage Weil [Fri, 16 Mar 2018 15:09:27 +0000 (10:09 -0500)]
osd/ECMsgTypes: print subchunks in ECSubRead operator<<

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr/dashboard: Allow sourcing `run-backend-api-tests.sh` 20874/head
Sebastian Wagner [Tue, 13 Mar 2018 15:32:25 +0000 (16:32 +0100)]
mgr/dashboard: Allow sourcing `run-backend-api-tests.sh`

This allows us to re-run tests faster. Also updated
HACKING.rst with the latest changes.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agoMerge pull request #20928 from dillaman/wip-dashboard-iscsi
Jason Dillaman [Fri, 16 Mar 2018 13:19:32 +0000 (09:19 -0400)]
Merge pull request #20928 from dillaman/wip-dashboard-iscsi

mgr/dashboard: fix 500 error on block device iSCSI status page

Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #20863 from rjfd/wip-qa-fix-ssl-conflict
Casey Bodley [Fri, 16 Mar 2018 13:04:10 +0000 (09:04 -0400)]
Merge pull request #20863 from rjfd/wip-qa-fix-ssl-conflict

qa/rgw: renamed ssl task to openssl_keys

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agocls/rbd: group_image_list incorrectly flagged as RW 20939/head
Jason Dillaman [Fri, 16 Mar 2018 12:59:08 +0000 (08:59 -0400)]
cls/rbd: group_image_list incorrectly flagged as RW

Fixes: http://tracker.ceph.com/issues/23388
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agomgr/dashboard: fix 500 error on block device iSCSI status page 20928/head
Jason Dillaman [Thu, 15 Mar 2018 21:41:20 +0000 (17:41 -0400)]
mgr/dashboard: fix 500 error on block device iSCSI status page

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agomgr/dashboard: remove node/npm system installation 20898/head
Tiago Melo [Wed, 14 Mar 2018 11:11:55 +0000 (11:11 +0000)]
mgr/dashboard: remove node/npm system installation

Node and npm are now being installed in a virtualenv, removing the need of
having it installed in the system or as a node dependency.

Now, if you want to use npm, you just need to activate the virtualenv created
on 'build/src/pybind/mgr/dashboard/node-env', and then you can execute the
same commands as you did before.

Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #20925 from rjfd/wip-dashboard-fix-qa
Ricardo Dias [Fri, 16 Mar 2018 09:38:52 +0000 (09:38 +0000)]
Merge pull request #20925 from rjfd/wip-dashboard-fix-qa

qa/suites/rados/mgr/tasks/dashboard_v2: add fail_on_skip = false

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/suites/rados/mgr/tasks/dashboard: add fail_on_skip = false 20925/head
Ricardo Dias [Thu, 15 Mar 2018 16:38:14 +0000 (16:38 +0000)]
qa/suites/rados/mgr/tasks/dashboard: add fail_on_skip = false

This commit prevents dashboard API tests to be tagged as failed when
some test is decorated with @skip.

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #20912 from rjfd/wip-dashboard-rename
Kefu Chai [Fri, 16 Mar 2018 08:36:51 +0000 (16:36 +0800)]
Merge pull request #20912 from rjfd/wip-dashboard-rename

mgr/dashboard: replace dashboard with dashboard_v2

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomgr/dashboard: renamed dashboard_v2 to dashboard 20912/head
Ricardo Dias [Thu, 15 Mar 2018 08:50:22 +0000 (08:50 +0000)]
mgr/dashboard: renamed dashboard_v2 to dashboard

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: remove dashboard module
Ricardo Dias [Thu, 15 Mar 2018 08:21:17 +0000 (08:21 +0000)]
mgr/dashboard: remove dashboard module

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #20916 from tspmelo/fix-mgr-perf-counter
Kefu Chai [Fri, 16 Mar 2018 03:23:02 +0000 (11:23 +0800)]
Merge pull request #20916 from tspmelo/fix-mgr-perf-counter

mgr/dashboard_v2: fix test_perf_counters_mgr_get

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20892 from guzhongyan/fix-mgrc
Kefu Chai [Fri, 16 Mar 2018 03:20:48 +0000 (11:20 +0800)]
Merge pull request #20892 from guzhongyan/fix-mgrc

mgr: fix MSG_MGR_MAP handling

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19811 from neha-ojha/wip-async-recovery
Josh Durgin [Thu, 15 Mar 2018 22:39:34 +0000 (15:39 -0700)]
Merge pull request #19811 from neha-ojha/wip-async-recovery

osd: async recovery

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #20922 from idryomov/wip-osdmap-encoding-fix
Sage Weil [Thu, 15 Mar 2018 21:07:09 +0000 (16:07 -0500)]
Merge pull request #20922 from idryomov/wip-osdmap-encoding-fix

osd/OSDMap: fix HAVE_FEATURE logic in encode()

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge remote-tracking branch 'gh/mimic-dev2'
Sage Weil [Thu, 15 Mar 2018 21:02:30 +0000 (16:02 -0500)]
Merge remote-tracking branch 'gh/mimic-dev2'

# Conflicts:
# qa/standalone/osd/repro_long_log.sh

7 years agoMerge pull request #20917 from liewegas/wip-no-query-debug
Sage Weil [Thu, 15 Mar 2018 20:59:58 +0000 (15:59 -0500)]
Merge pull request #20917 from liewegas/wip-no-query-debug

osd: debug dispatch_context cases where queries not sent

Reviewed-by: Josh Durgin <jduring@redhat.com>
7 years agoMerge pull request #20918 from liewegas/wip-less-many
Sage Weil [Thu, 15 Mar 2018 20:59:42 +0000 (15:59 -0500)]
Merge pull request #20918 from liewegas/wip-less-many

qa/suites/rados: fewer msgr failures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #20919 from liewegas/wip-cot
Sage Weil [Thu, 15 Mar 2018 20:59:22 +0000 (15:59 -0500)]
Merge pull request #20919 from liewegas/wip-cot

qa/standalone/osd/repro_long_log: no-mon-config for cot

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoPG: dout cleanup 19811/head
Neha Ojha [Thu, 15 Mar 2018 19:59:28 +0000 (12:59 -0700)]
PG: dout cleanup

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoPG: add async recovery and backfill to pg dout() prefix
Neha Ojha [Thu, 15 Mar 2018 00:42:28 +0000 (17:42 -0700)]
PG: add async recovery and backfill to pg dout() prefix

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoPG: use clear_location() to clear out missing_loc
Neha Ojha [Thu, 15 Mar 2018 00:32:47 +0000 (17:32 -0700)]
PG: use clear_location() to clear out missing_loc

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoPG: use get_recovery_read to prevent race during recovery deletes
Neha Ojha [Sun, 11 Mar 2018 05:27:23 +0000 (21:27 -0800)]
PG: use get_recovery_read to prevent race during recovery deletes

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoPG: handle async targets with missing clone in _rollback_to()
Neha Ojha [Thu, 8 Mar 2018 16:07:57 +0000 (08:07 -0800)]
PG: handle async targets with missing clone in _rollback_to()

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoECBackend: send correct stats to async_recovery_targets
Neha Ojha [Thu, 1 Mar 2018 20:01:18 +0000 (12:01 -0800)]
ECBackend: send correct stats to async_recovery_targets

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoqa: modify TEST_recovery_sizeup() to handle async recovery
Neha Ojha [Tue, 27 Feb 2018 18:37:56 +0000 (10:37 -0800)]
qa: modify TEST_recovery_sizeup() to handle async recovery

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoPG: want set size should not be below min_size
Neha Ojha [Thu, 22 Feb 2018 22:09:45 +0000 (14:09 -0800)]
PG: want set size should not be below min_size

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoPG: clear missing_loc only during async_recovery
Neha Ojha [Wed, 21 Feb 2018 16:40:48 +0000 (08:40 -0800)]
PG: clear missing_loc only during async_recovery

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoPG: add location to missing_loc only during async_recovery
Neha Ojha [Wed, 21 Feb 2018 04:57:20 +0000 (20:57 -0800)]
PG: add location to missing_loc only during async_recovery

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoPG: clear out old missing_loc in issue_repop
Neha Ojha [Fri, 16 Feb 2018 20:19:53 +0000 (12:19 -0800)]
PG: clear out old missing_loc in issue_repop

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoPG: handle degraded object in _rollback_to()
Neha Ojha [Wed, 7 Feb 2018 01:42:54 +0000 (17:42 -0800)]
PG: handle degraded object in _rollback_to()

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoECBackend: update pg_log missing for async_recovery_targets
Neha Ojha [Wed, 31 Jan 2018 02:45:58 +0000 (18:45 -0800)]
ECBackend: update pg_log missing for async_recovery_targets

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoPG: skip primary in peer_missing in rebuild()
Neha Ojha [Wed, 31 Jan 2018 02:02:20 +0000 (18:02 -0800)]
PG: skip primary in peer_missing in rebuild()

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge PR #20880 into wip-sage-testing-20180315.163409
Sage Weil [Thu, 15 Mar 2018 16:34:18 +0000 (11:34 -0500)]
Merge PR #20880 into wip-sage-testing-20180315.163409

* refs/pull/20880/head:
"Correct" license from LGPL2 to LGPL2.1

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #20910 from ceph/fix_callback_plugins_dir
Andrew Schoen [Thu, 15 Mar 2018 15:14:36 +0000 (16:14 +0100)]
Merge pull request #20910 from ceph/fix_callback_plugins_dir

ceph-volume: fix action plugins path in tests

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20897 from ifed01/wip-ifed-discard-on-mkfs
Kefu Chai [Thu, 15 Mar 2018 15:09:29 +0000 (23:09 +0800)]
Merge pull request #20897 from ifed01/wip-ifed-discard-on-mkfs

os/bluestore: do SSD discard on mkfs

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20895 from tchaikov/wip-drop-unused-options
Kefu Chai [Thu, 15 Mar 2018 15:08:24 +0000 (23:08 +0800)]
Merge pull request #20895 from tchaikov/wip-drop-unused-options

common/options: drop unused options

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20445 from aclamk/wip-assert-smaller
Kefu Chai [Thu, 15 Mar 2018 15:07:35 +0000 (23:07 +0800)]
Merge pull request #20445 from aclamk/wip-assert-smaller

common: Make code to invoke assert() smaller.

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20887 from liewegas/wip-kill-backlog
Kefu Chai [Thu, 15 Mar 2018 15:07:02 +0000 (23:07 +0800)]
Merge pull request #20887 from liewegas/wip-kill-backlog

osd/osd_types: remove backlog type for pg_log_entry_t

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd/OSDMap: fix HAVE_FEATURE logic in encode() 20922/head
Ilya Dryomov [Thu, 15 Mar 2018 14:26:21 +0000 (15:26 +0100)]
osd/OSDMap: fix HAVE_FEATURE logic in encode()

Currently clients that don't have SERVER_LUMINOUS end up being fed
v6 (i.e. luminous) encoding because they also don't have SERVER_MIMIC.
This was introduced in commit 553048fbf97a ("osd/OSDMap: track newly
removed and purged snaps in each epoch").

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
7 years agoqa/standalone/osd/repro_long_log: no-mon-config for cot 20919/head
Sage Weil [Thu, 15 Mar 2018 13:42:14 +0000 (08:42 -0500)]
qa/standalone/osd/repro_long_log: no-mon-config for cot

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/rados: fewer msgr failures 20918/head
Sage Weil [Thu, 15 Mar 2018 13:39:28 +0000 (08:39 -0500)]
qa/suites/rados: fewer msgr failures

500 is a bit much... e.g., enough to hit timeouts forming mon quorum.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: debug dispatch_context cases where queries not sent 20917/head
Sage Weil [Thu, 15 Mar 2018 13:32:14 +0000 (08:32 -0500)]
osd: debug dispatch_context cases where queries not sent

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr/dashboard_v2: fix test_perf_counters_mgr_get 20916/head
Tiago Melo [Thu, 15 Mar 2018 12:44:52 +0000 (12:44 +0000)]
mgr/dashboard_v2: fix test_perf_counters_mgr_get

Now that we can obtain perf counters for the mgr, we need to assert that we get
more than 0 counters and that they have the desired structure.

Fixes: https://tracker.ceph.com/issues/23378
Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agomemstore: fix wrong use of lock_guard 20914/head
Shen-Ta Hsieh(BestSteve) [Thu, 15 Mar 2018 12:31:13 +0000 (20:31 +0800)]
memstore: fix wrong use of lock_guard

std::lock_guard need a name to make RAII works properly
Signed-off-by: Shen-Ta Hsieh <ibmibmibm.tw@gmail.com>
7 years agoceph-volume: fix action plugins path in tox 20910/head
Guillaume Abrioux [Thu, 15 Mar 2018 08:45:28 +0000 (09:45 +0100)]
ceph-volume: fix action plugins path in tox

because of this commit [1] in ceph-ansible tests in ceph-volume needs to
be modified accordingly.

[1] https://github.com/ceph/ceph-ansible/commit/60d4b75f519c03fca91384f231b071793f582376

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
7 years agomon/ConfigMonitor: clean up prepare_command() 20911/head
Gu Zhongyan [Thu, 15 Mar 2018 09:35:02 +0000 (17:35 +0800)]
mon/ConfigMonitor: clean up prepare_command()

no more paxos->get_pending_transaction()

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
7 years agoMerge pull request #20836 from xiexingguo/wip-balancer-05
Kefu Chai [Thu, 15 Mar 2018 06:28:46 +0000 (14:28 +0800)]
Merge pull request #20836 from xiexingguo/wip-balancer-05

pybind/mgr/balancer: add sanity check against empty adjusted_map

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20857 from zealoussnow/wip-leozhang
Kefu Chai [Thu, 15 Mar 2018 06:27:36 +0000 (14:27 +0800)]
Merge pull request #20857 from zealoussnow/wip-leozhang

osd/bluestore: delete unused variable in KernelDevice

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #20690 from myoungwon/wip-manifest-num-counter
Kefu Chai [Thu, 15 Mar 2018 06:26:28 +0000 (14:26 +0800)]
Merge pull request #20690 from myoungwon/wip-manifest-num-counter

osd: add num_object_manifest

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20652 from shangfufei/wip-common
Kefu Chai [Thu, 15 Mar 2018 06:24:22 +0000 (14:24 +0800)]
Merge pull request #20652 from shangfufei/wip-common

src/common: update some ms_* options to be more consistent

Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agoMerge pull request #20886 from liewegas/wip-kill-min-max
Kefu Chai [Thu, 15 Mar 2018 06:22:52 +0000 (14:22 +0800)]
Merge pull request #20886 from liewegas/wip-kill-min-max

include: kill MIN and MAX macros

Reviewed-by: Greg Farnum <gfarnum@redhat.com>