]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoosd: store op request source info 16504/head
Yan Jun [Sat, 22 Jul 2017 07:29:39 +0000 (15:29 +0800)]
osd: store op request source info

if we use command 'ceph daemon osd.# dump_historic_ops' to check the history
 tracked ops, the 'client_addr' is always dumped as '-' which result in clients
indistinguishable from each other.

"description": "osd_op(client.24123.0:328 3.36 3:6ec0d61b:::rbd_data.10472ae8944a.0000000000000289:head [write 4141056~4096 [fadvise_sequential]] snapc 0=[] ondisk+write+known_if_redirected e36)",
            "initiated_at": "2017-07-22 14:24:25.925633",
            "age": 4.893190,
            "duration": 0.272642,
            "type_data": {
                "flag_point": "commit sent; apply or cleanup",
                "client_info": {
                    "client": "client.24123",
                    "client_addr": "-",
                    "tid": 328
                },

It is because 'connection' was reset to nullptr in function '_unregistered'
before op has been inserted into history, so the 'get_source_addr' always return
empty entity addr.

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
8 years agocommon: dump field name of 'flag_point' and 'client_info'
Yan Jun [Sat, 22 Jul 2017 06:27:55 +0000 (14:27 +0800)]
common: dump field name of 'flag_point' and 'client_info'

we used to open "type_data" section as a array (that's open_array_section),
some key field names can not be dumped out. use open_object_section to dump them
as following:

before this change:
------------------
"description": "osd_op(client.4202.0:4958 3.28 3:163e8348:::rbd_data.10472ae8944a.0000000000000164:head [write 1691648~4096 [fadvise_sequential]] snapc 0=[] ondisk+write+known_if_redirected e24)",
            "initiated_at": "2017-07-22 14:22:13.469324",
            "age": 17.595664,
            "duration": 0.460406,
            "type_data": [
                "commit sent; apply or cleanup",
                {
                    "client": "client.4202",
                    "client_addr": "-",
                    "tid": 4958
                },
-----------------
after:
-----------------
"description": "osd_op(client.24123.0:328 3.36 3:6ec0d61b:::rbd_data.10472ae8944a.0000000000000289:head [write 4141056~4096 [fadvise_sequential]] snapc 0=[] ondisk+write+known_if_redirected e36)",
            "initiated_at": "2017-07-22 14:24:25.925633",
            "age": 4.893190,
            "duration": 0.272642,
            "type_data": {
                "flag_point": "commit sent; apply or cleanup",
                "client_info": {
                    "client": "client.24123",
                    "client_addr": "-",
                    "tid": 328
                },
----------------

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
8 years agoMerge pull request #16429 from liewegas/wip-jewel-x
Sage Weil [Thu, 20 Jul 2017 15:47:05 +0000 (10:47 -0500)]
Merge pull request #16429 from liewegas/wip-jewel-x

qa/suites/upgrade/jewel-x: misc fixes for new health checks

8 years agoMerge pull request #16374 from majianpeng/bluestore-double-count-kv-queue-lat
Sage Weil [Thu, 20 Jul 2017 15:44:40 +0000 (10:44 -0500)]
Merge pull request #16374 from majianpeng/bluestore-double-count-kv-queue-lat

os/bluestore/BlueStore: Avoid double counting state_kv_queued_lat.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #16423 from liewegas/wip-ls
Sage Weil [Thu, 20 Jul 2017 15:43:34 +0000 (10:43 -0500)]
Merge pull request #16423 from liewegas/wip-ls

mon: '* list' -> '* ls'

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16434 from badone/wip-fix-deep-age-reporting
Sage Weil [Thu, 20 Jul 2017 15:43:15 +0000 (10:43 -0500)]
Merge pull request #16434 from badone/wip-fix-deep-age-reporting

mon: Fix deep_age copy paste error

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16444 from tchaikov/wip-test-osd-stat
Kefu Chai [Thu, 20 Jul 2017 15:41:53 +0000 (23:41 +0800)]
Merge pull request #16444 from tchaikov/wip-test-osd-stat

qa/workunits/cephtool/test.sh: "ceph osd stat" output changed, update accordingly

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #14287 from oritwas/wip-rgw-usage
Yuri Weinstein [Thu, 20 Jul 2017 15:39:21 +0000 (08:39 -0700)]
Merge pull request #14287 from oritwas/wip-rgw-usage

rgw: usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
8 years agoMerge pull request #15673 from yehudasa/wip-20107
Yuri Weinstein [Thu, 20 Jul 2017 15:35:07 +0000 (08:35 -0700)]
Merge pull request #15673 from yehudasa/wip-20107

cls/refcount: store and use list of retired tags

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #16421 from tchaikov/wip-19939
Kefu Chai [Thu, 20 Jul 2017 14:52:17 +0000 (22:52 +0800)]
Merge pull request #16421 from tchaikov/wip-19939

messages/: always set header.version in encode_payload()

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #16418 from theanalyst/doc-rgw-tenant-names
Jos Collin [Thu, 20 Jul 2017 14:38:45 +0000 (14:38 +0000)]
Merge pull request #16418 from theanalyst/doc-rgw-tenant-names

doc: rgw clarify limitations when creating tenant names

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agoMerge pull request #16443 from wjwithagen/bug-wjw-qa-test-reorder
Kefu Chai [Thu, 20 Jul 2017 14:13:37 +0000 (22:13 +0800)]
Merge pull request #16443 from wjwithagen/bug-wjw-qa-test-reorder

cephtool/test.sh: Only delete a test pool when no longer needed.

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #16451 from tchaikov/wip-qa-reg11184
Jason Dillaman [Thu, 20 Jul 2017 13:37:53 +0000 (09:37 -0400)]
Merge pull request #16451 from tchaikov/wip-qa-reg11184

qa/tasks/reg11184: use literal 'foo' instead pool_name

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoqa/tasks/reg11184: use literal 'foo' instead pool_name 16451/head
Kefu Chai [Thu, 20 Jul 2017 13:20:30 +0000 (21:20 +0800)]
qa/tasks/reg11184: use literal 'foo' instead pool_name

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16412 from wido/zabbix-release-notes
Kefu Chai [Thu, 20 Jul 2017 12:20:54 +0000 (20:20 +0800)]
Merge pull request #16412 from wido/zabbix-release-notes

doc: Add Zabbix ceph-mgr plugin to PendingReleaseNotes

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agorelease notes: Add Zabbix ceph-mgr module to PendingReleaseNotes 16412/head
Wido den Hollander [Wed, 19 Jul 2017 07:33:50 +0000 (09:33 +0200)]
release notes: Add Zabbix ceph-mgr module to PendingReleaseNotes

Signed-off-by: Wido den Hollander <wido@42on.com>
8 years agodoc: rgw clarify limitations when creating tenant names 16418/head
Abhishek Lekshmanan [Wed, 19 Jul 2017 11:57:48 +0000 (13:57 +0200)]
doc: rgw clarify limitations when creating tenant names

We only allow alphanumeric and underscore characters in tenant names
according to the validation in `RGWHandler_REST::validate_tenant_name`

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoqa/workunits/cephtool/test.sh: "ceph osd stat" output changed, update test accordingly 16444/head
Kefu Chai [Thu, 20 Jul 2017 11:34:35 +0000 (19:34 +0800)]
qa/workunits/cephtool/test.sh: "ceph osd stat" output changed, update test accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agocephtool/test.sh: Only delete a test pool when no longer needed. 16443/head
Willem Jan Withagen [Thu, 20 Jul 2017 10:24:14 +0000 (12:24 +0200)]
cephtool/test.sh: Only delete a test pool when no longer needed.

the pool_getset pool is deleted before all tests on it are complete

4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1990: test_mon_osd_pool_set:  ceph osd pool delete pool_get
set pool_getset --yes-i-really-really-mean-it
4: pool 'pool_getset' removed
4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1992: test_mon_osd_pool_set:  ceph osd pool get rbd crush_r
ule
4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1992: test_mon_osd_pool_set:  grep 'crush_rule: '
4: crush_rule: replicated_rule
4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1994: test_mon_osd_pool_set:  ceph -f json osd pool get poo
l_getset compression_mode
4: Error ENOENT: unrecognized pool 'pool_getset'

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #16403 from wjwithagen/bug-wjw-ceph-osd-stat
Kefu Chai [Thu, 20 Jul 2017 10:06:47 +0000 (18:06 +0800)]
Merge pull request #16403 from wjwithagen/bug-wjw-ceph-osd-stat

test: ceph osd stat out has changed, fix tests for that

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16428 from idryomov/wip-krbd-luminous-thrash
Ilya Dryomov [Thu, 20 Jul 2017 09:28:22 +0000 (11:28 +0200)]
Merge pull request #16428 from idryomov/wip-krbd-luminous-thrash

qa: thrash tests for backoff and upmap

Reviewed-by: Vasu Kulkarni <vasu@redhat.com>
8 years agoMerge pull request #16424 from tchaikov/wip-assert-in-c
Kefu Chai [Thu, 20 Jul 2017 06:49:49 +0000 (14:49 +0800)]
Merge pull request #16424 from tchaikov/wip-assert-in-c

include/assert: test c++ before using static_cast<>

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16400 from liewegas/wip-crush-rule-id
Sage Weil [Thu, 20 Jul 2017 03:02:41 +0000 (22:02 -0500)]
Merge pull request #16400 from liewegas/wip-crush-rule-id

crush: s/ruleset/id/ in decompiled output; prevent compilation when ruleset != id

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #16402 from liewegas/wip-20105
Sage Weil [Thu, 20 Jul 2017 03:02:04 +0000 (22:02 -0500)]
Merge pull request #16402 from liewegas/wip-20105

ceph_test_rados_api_watch_notify: flush after unwatch

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomon: hide 'osd crush rule list' (we prefer 'ls') 16423/head
Sage Weil [Thu, 20 Jul 2017 02:47:21 +0000 (22:47 -0400)]
mon: hide 'osd crush rule list' (we prefer 'ls')

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16433 from dmick/wip-ccache
Kefu Chai [Thu, 20 Jul 2017 02:09:28 +0000 (10:09 +0800)]
Merge pull request #16433 from dmick/wip-ccache

do_cmake.sh: fix syntax for /bin/sh (doesn't have +=)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomon: Fix deep_age copy paste error 16434/head
Brad Hubbard [Wed, 19 Jul 2017 23:27:10 +0000 (09:27 +1000)]
mon: Fix deep_age copy paste error

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agodo_cmake.sh: fix syntax for /bin/sh (doesn't have +=) 16433/head
Dan Mick [Wed, 19 Jul 2017 22:02:02 +0000 (15:02 -0700)]
do_cmake.sh: fix syntax for /bin/sh (doesn't have +=)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agoMerge pull request #16309 from fangyuxiangGL/fix-admin-rest-api
Casey Bodley [Wed, 19 Jul 2017 20:13:27 +0000 (16:13 -0400)]
Merge pull request #16309 from fangyuxiangGL/fix-admin-rest-api

rgw: modify email to empty by admin RESTful api doesn't work

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15952 from jdurgin/wip-peering-deletes
Yuri Weinstein [Wed, 19 Jul 2017 19:53:25 +0000 (12:53 -0700)]
Merge pull request #15952 from jdurgin/wip-peering-deletes

osd: process deletes during recovery instead of peering

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16376 from jecluis/wip-mon-fix-loglast
Yuri Weinstein [Wed, 19 Jul 2017 19:52:09 +0000 (12:52 -0700)]
Merge pull request #16376 from jecluis/wip-mon-fix-loglast

mon/LogMonitor: don't read list's end() for log last

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16419 from Abhishekvrshny/fix-err-msg
Casey Bodley [Wed, 19 Jul 2017 19:48:06 +0000 (15:48 -0400)]
Merge pull request #16419 from Abhishekvrshny/fix-err-msg

rgw: fix error message in removing bucket with --bypass-gc flag

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
8 years agoMerge pull request #16431 from jeffgreenca/master
Sage Weil [Wed, 19 Jul 2017 17:57:14 +0000 (12:57 -0500)]
Merge pull request #16431 from jeffgreenca/master

doc: Fixed a typo in yum repo filename script

8 years agoMerge pull request #15763 from dillaman/wip-pool-tags
Sage Weil [Wed, 19 Jul 2017 17:56:10 +0000 (12:56 -0500)]
Merge pull request #15763 from dillaman/wip-pool-tags

mon: support pool application metadata key/values

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agodoc: Fixed a typo in yum repo filename script 16431/head
Jeff Green [Wed, 19 Jul 2017 17:51:09 +0000 (10:51 -0700)]
doc: Fixed a typo in yum repo filename script

Signed-off-by: Jeff Green <jeff.green.ca@gmail.com>
8 years agoPendingReleaseNotes: included details for the pool tags 15763/head
Jason Dillaman [Wed, 19 Jul 2017 17:11:50 +0000 (13:11 -0400)]
PendingReleaseNotes: included details for the pool tags

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agodoc: fixed warning on rbd quick start link reference
Jason Dillaman [Wed, 19 Jul 2017 17:06:04 +0000 (13:06 -0400)]
doc: fixed warning on rbd quick start link reference

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agodoc: document pool tags in rados pool operations doc
Jason Dillaman [Wed, 19 Jul 2017 16:59:51 +0000 (12:59 -0400)]
doc: document pool tags in rados pool operations doc

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agotest/librados_test_stub: added new application metadata APIs
Jason Dillaman [Tue, 18 Jul 2017 16:10:35 +0000 (12:10 -0400)]
test/librados_test_stub: added new application metadata APIs

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: disable application health warnings for upgrade test cases
Jason Dillaman [Fri, 7 Jul 2017 13:26:45 +0000 (09:26 -0400)]
mon: disable application health warnings for upgrade test cases

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agotest: skip pool application metadata tests if OSDs not at min luminous
Jason Dillaman [Wed, 28 Jun 2017 16:56:46 +0000 (12:56 -0400)]
test: skip pool application metadata tests if OSDs not at min luminous

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agotest: enable pool applications for new pools
Jason Dillaman [Tue, 27 Jun 2017 01:15:57 +0000 (21:15 -0400)]
test: enable pool applications for new pools

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: disable application metadata on cache tier pools
Jason Dillaman [Tue, 27 Jun 2017 00:51:19 +0000 (20:51 -0400)]
mon: disable application metadata on cache tier pools

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd: add new 'pool init' action for initializing a RBD pool
Jason Dillaman [Mon, 26 Jun 2017 13:48:00 +0000 (09:48 -0400)]
rbd: add new 'pool init' action for initializing a RBD pool

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorgw: auto-tag created pools as owned by rgw
Jason Dillaman [Fri, 23 Jun 2017 13:30:26 +0000 (09:30 -0400)]
rgw: auto-tag created pools as owned by rgw

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrados: added async application enable API
Jason Dillaman [Wed, 21 Jun 2017 01:39:05 +0000 (21:39 -0400)]
librados: added async application enable API

RGW has numerous pool creation calls, one of which utilizes
an async interface. This adds support for RGW's use-case.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrados: new API to manipulate pool application metadata
Jason Dillaman [Tue, 20 Jun 2017 23:26:13 +0000 (19:26 -0400)]
librados: new API to manipulate pool application metadata

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: auto-enable CephFS on pools when using "fs new"/"fs add_data_pool"
Jason Dillaman [Tue, 20 Jun 2017 16:13:42 +0000 (12:13 -0400)]
mon: auto-enable CephFS on pools when using "fs new"/"fs add_data_pool"

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: default 'rbd' pool to the 'rbd' application
Jason Dillaman [Tue, 20 Jun 2017 16:19:07 +0000 (12:19 -0400)]
mon: default 'rbd' pool to the 'rbd' application

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: heuristics for auto-enabling pool applications upon upgrade
Jason Dillaman [Tue, 20 Jun 2017 13:59:20 +0000 (09:59 -0400)]
mon: heuristics for auto-enabling pool applications upon upgrade

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: health warning if in-use pools don't have application enabled
Jason Dillaman [Mon, 19 Jun 2017 20:36:42 +0000 (16:36 -0400)]
mon: health warning if in-use pools don't have application enabled

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: added new "osd pool application" commands
Jason Dillaman [Mon, 19 Jun 2017 20:18:59 +0000 (16:18 -0400)]
mon: added new "osd pool application" commands

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: store application metadata in pg_pool_t
Jason Dillaman [Mon, 19 Jun 2017 16:23:01 +0000 (12:23 -0400)]
mon: store application metadata in pg_pool_t

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: 'auth list' -> 'auth ls'
Sage Weil [Wed, 19 Jul 2017 16:33:14 +0000 (12:33 -0400)]
mon: 'auth list' -> 'auth ls'

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: 'config-key list' -> 'config-key ls'
Sage Weil [Wed, 19 Jul 2017 13:41:14 +0000 (09:41 -0400)]
mon: 'config-key list' -> 'config-key ls'

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16275 from linuxbox2/wip-rgw-readdir-cookie
Yuri Weinstein [Wed, 19 Jul 2017 15:43:16 +0000 (08:43 -0700)]
Merge pull request #16275 from linuxbox2/wip-rgw-readdir-cookie

rgw_file: permit dirent offset computation

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #16368 from theanalyst/fix/rgw-reshard-pool-ns
Yuri Weinstein [Wed, 19 Jul 2017 15:42:36 +0000 (08:42 -0700)]
Merge pull request #16368 from theanalyst/fix/rgw-reshard-pool-ns

rgw: use a namespace for rgw reshard pool for upgrades as well

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #16395 from jecluis/wip-fix-mon-mgr-bootstrap
Sage Weil [Wed, 19 Jul 2017 15:02:06 +0000 (10:02 -0500)]
Merge pull request #16395 from jecluis/wip-fix-mon-mgr-bootstrap

mon/AuthMonitor: generate bootstrap-mgr key on upgrade

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16425 from smithfarm/wip-ceph-w
Sage Weil [Wed, 19 Jul 2017 14:47:12 +0000 (09:47 -0500)]
Merge pull request #16425 from smithfarm/wip-ceph-w

doc: PendingReleaseNotes: "ceph -w" behavior has changed drastically

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16314 from tchaikov/wip-doc-replace-osd
Kefu Chai [Wed, 19 Jul 2017 14:38:11 +0000 (22:38 +0800)]
Merge pull request #16314 from tchaikov/wip-doc-replace-osd

doc: add instructions for replacing an OSD

Reviewed-by: Alfredo Deza <adeza@redhat.com>
8 years agoqa/workunits/cephtool/test.sh: ceph osd stat out has changed, fix tests for that 16403/head
Willem Jan Withagen [Wed, 19 Jul 2017 12:12:16 +0000 (14:12 +0200)]
qa/workunits/cephtool/test.sh: ceph osd stat out has changed, fix tests for that

The output of ceph osd stat has changed,
It printed:

cluster b370a29d-9287-4ca3-ab57-3d824f65e339
 health HEALTH_OK
 monmap e1: 1 mons at {ceph1=10.0.0.8:6789/0}, election epoch 2, quorum 0 ceph1
 osdmap e63: 2 osds: 2 up, 2 in
  pgmap v41338: 952 pgs, 20 pools, 17130 MB data, 2199 objects
        115 GB used, 167 GB / 297 GB avail
             952 active+clean

but now the osdmap line has gone and thus this no longer works:
qa/workunits/cephtool/test.sh:1944:
old_pgs=$(ceph osd pool get $TEST_POOL_GETSET pg_num | sed -e 's/pg_num: //')
new_pgs=$(($old_pgs+$(ceph osd stat | grep osdmap | awk '{print $3}')*32))

4: qa/workunits/cephtool/test.sh: line 1945: 10+*32: syntax errotoken is "*32")

 - And parse the output in json , with jq, for better reliability

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoinclude/assert: test c++ before using static_cast<> 16424/head
Kefu Chai [Wed, 19 Jul 2017 13:57:07 +0000 (21:57 +0800)]
include/assert: test c++ before using static_cast<>

this partially reverts 2e7c72d.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agodoc: PendingReleaseNotes: "ceph -w" behavior has changed drastically 16425/head
Nathan Cutler [Wed, 19 Jul 2017 14:12:30 +0000 (16:12 +0200)]
doc: PendingReleaseNotes: "ceph -w" behavior has changed drastically

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agomessages/: always set header.version in encode_payload() 16421/head
Kefu Chai [Wed, 19 Jul 2017 13:13:35 +0000 (21:13 +0800)]
messages/: always set header.version in encode_payload()

we encode the payload w/o the writelock even can_write == NOWRITE, if
the message "can_fast_prepare". in that case, the "feature" of the
connection is 0, as no handshake happens yet. so the header.version is
always set to a version compatible with pre-luminous. but when the
message is re-encoded when the connection is re-established with feature
with luminous, the header.version is not set back to HEADER_VERSION.
that's why the message's encoding is not consistent with header.version
sometimes.

in this change, we always set the header.version in encode_payload(), so
it's consistent even after connection reset and message re-encoding.

Fixes: http://tracker.ceph.com/issues/19939
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agorgw: fix error message in removing bucket with --bypass-gc flag 16419/head
Abhishek Varshney [Wed, 19 Jul 2017 11:57:08 +0000 (11:57 +0000)]
rgw: fix error message in removing bucket with --bypass-gc flag

Fixes: http://tracker.ceph.com/issues/20688
Signed-off-by: Abhishek Varshney <abhishek.varshney@flipkart.com>
8 years agoMerge pull request #16411 from smithfarm/wip-crn-regression
Abhishek L [Wed, 19 Jul 2017 11:25:10 +0000 (13:25 +0200)]
Merge pull request #16411 from smithfarm/wip-crn-regression

tools: ceph-release-notes: refactor and fix regressions

Reviewed-By: Kefu Chai <kchai@redhat.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoqa/suites/krbd: add luminous thrash tests 16428/head
Ilya Dryomov [Mon, 10 Jul 2017 14:54:24 +0000 (16:54 +0200)]
qa/suites/krbd: add luminous thrash tests

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
8 years agoqa/suites/krbd: reorganize thrash tests
Ilya Dryomov [Mon, 10 Jul 2017 14:54:24 +0000 (16:54 +0200)]
qa/suites/krbd: reorganize thrash tests

- factor out install and ceph into ceph/ceph.yaml
- pg_num thrashing + 20 minute health timeout for thrashosds
- common thrashosds-health.yaml whitelist
- drop iozone workload

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
8 years agoqa/suites/krbd: heavier rbd_fio workload
Ilya Dryomov [Tue, 4 Jul 2017 15:24:22 +0000 (17:24 +0200)]
qa/suites/krbd: heavier rbd_fio workload

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
8 years agoqa/tasks/rbd_fio: dump fio options before starting
Ilya Dryomov [Tue, 4 Jul 2017 15:20:51 +0000 (17:20 +0200)]
qa/tasks/rbd_fio: dump fio options before starting

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
8 years agoqa/tasks/rbd_fio: support libaio engine
Ilya Dryomov [Tue, 4 Jul 2017 15:09:22 +0000 (17:09 +0200)]
qa/tasks/rbd_fio: support libaio engine

Want to set iodepth and do direct AIO.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
8 years agotools: ceph-release-notes: match Reviewed-by more liberally 16411/head
Nathan Cutler [Wed, 19 Jul 2017 08:35:04 +0000 (10:35 +0200)]
tools: ceph-release-notes: match Reviewed-by more liberally

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotools: ceph-release-notes: fix sorted() key lambda regression
Nathan Cutler [Wed, 19 Jul 2017 07:37:31 +0000 (09:37 +0200)]
tools: ceph-release-notes: fix sorted() key lambda regression

https://github.com/ceph/ceph/pull/16261 ported the script to Python 3, but it
retained the 2-argument version of the sorted() key function - in Python 3 the
key function takes only one argument.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotools: ceph-release-notes: refactor and fix regression
Nathan Cutler [Mon, 17 Jul 2017 10:16:25 +0000 (12:16 +0200)]
tools: ceph-release-notes: refactor and fix regression

This commit refactors the logic for determining the PR title and merge message,
and fixes a regression introduced by https://github.com/ceph/ceph/pull/16277

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotest: add a couple lost+delete unit tests 15952/head
Josh Durgin [Sun, 16 Jul 2017 02:28:59 +0000 (22:28 -0400)]
test: add a couple lost+delete unit tests

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosd/PrimaryLogPG: guard lost_delete missing_loc change by feature flag
Josh Durgin [Thu, 13 Jul 2017 23:29:50 +0000 (19:29 -0400)]
osd/PrimaryLogPG: guard lost_delete missing_loc change by feature flag

With deletes during recovery instead of during log processing, we need
to keep the entry in missing_loc.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoTestPGLog: add unit tests for rebuilding missing set
Josh Durgin [Wed, 12 Jul 2017 21:29:36 +0000 (17:29 -0400)]
TestPGLog: add unit tests for rebuilding missing set

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoPGLog, PrimaryLogPG: rebuild the missing set when the OSDMap flag is set
Josh Durgin [Thu, 13 Jul 2017 18:44:21 +0000 (14:44 -0400)]
PGLog, PrimaryLogPG: rebuild the missing set when the OSDMap flag is set

The recovery_deletes flag will only be set once, by the 'ceph osd
require-osd-release luminous' command.

This matches how we rebuild the missing set when reading it off disk in
read_log_and_missing().

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosd_types, PGLog: encode missing based on features
Josh Durgin [Tue, 4 Jul 2017 01:06:23 +0000 (21:06 -0400)]
osd_types, PGLog: encode missing based on features

Store whether the missing set should contain deletes, so that
persisted versions can be rebuilt if needed. Make missing_item
versioned, since it's persisted by the pg_log as an individual omap
value.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosd_types, Objecter: make recovery_deletes feature create a new interval
Josh Durgin [Tue, 4 Jul 2017 02:05:03 +0000 (22:05 -0400)]
osd_types, Objecter: make recovery_deletes feature create a new interval

This is needed to create a single place to regenerate the missing set
- at the start of a new interval where support for recovery deletes
changed.

The missing set is otherwise not cleared, so it would need to be
rebuilt in arbitrary places if e.g. an osd not supporting it went down
and restarted with support, or if we used a feature flag command to
trigger rebuilding the missing set.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoOSDMap, OSDMonitor: automatically set recovery deletes for luminous
Josh Durgin [Thu, 6 Jul 2017 00:15:24 +0000 (20:15 -0400)]
OSDMap, OSDMonitor: automatically set recovery deletes for luminous

Once the required osd release is luminous, all osds must support
recovery deletes, so set the flag then. This avoids an extra manual
step in luminous upgrades.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoOSDMap, OSDMonitor: add flag for all osds supporting recovery deletes
Josh Durgin [Thu, 6 Jul 2017 00:12:57 +0000 (20:12 -0400)]
OSDMap, OSDMonitor: add flag for all osds supporting recovery deletes

Just like sortbitwise, this can only be toggled on, and once on osds
that do not support it are not allowed to boot.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosd: add incompat superblock feature for deletes during recovery
Josh Durgin [Mon, 3 Jul 2017 23:35:02 +0000 (19:35 -0400)]
osd: add incompat superblock feature for deletes during recovery

On-disk missing sets would need to be regenerated if downgraded from
luminous to kraken.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoinclude/ceph_features.h: add feature bit for handling deletes during recovery
Josh Durgin [Fri, 30 Jun 2017 00:12:39 +0000 (20:12 -0400)]
include/ceph_features.h: add feature bit for handling deletes during recovery

The BLKIN feature bit was actually unused - it was a remnant from
earlier versions of the blkin work, but all the encoding is handled by
struct-level versioning in the version that merged.

Use bit 60 (unused in any prior version) so that recovery deletes
could potentially be backported.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosd/PGBackend: include min_epoch in RecoveryDelete messages
Josh Durgin [Wed, 28 Jun 2017 01:35:55 +0000 (21:35 -0400)]
osd/PGBackend: include min_epoch in RecoveryDelete messages

This matches ordering with other recovery messages, and may speed up
processing a bit.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosd/PGLog: reset complete_to when appending lost_delete entries
Josh Durgin [Tue, 27 Jun 2017 01:45:15 +0000 (21:45 -0400)]
osd/PGLog: reset complete_to when appending lost_delete entries

Since lost_deletes queue recovery directly, and don't go through
activate_not_complete(), our complete_to iterator may still point at
log.end() (a list iterator pointing to .end() will still point to
.end() after a push_back().). Reset it to point before these new
lost_delete entries. This is needed now that lost_deletes are
performed during recovery, instead of inline when merging logs.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #16386 from mikulely/rgw-cleanup
Jos Collin [Wed, 19 Jul 2017 05:39:24 +0000 (05:39 +0000)]
Merge pull request #16386 from mikulely/rgw-cleanup

rgw: drop unused find_replacement() and some function docs

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agorgw: miis trivial cleanup 16386/head
Jiaying Ren [Mon, 19 Jun 2017 15:35:46 +0000 (23:35 +0800)]
rgw: miis trivial cleanup

+ drop outdated & misplaced function description
+ drop unused func find_placement

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
8 years agodoc: add instructions for replacing an OSD 16314/head
Kefu Chai [Thu, 13 Jul 2017 08:02:24 +0000 (16:02 +0800)]
doc: add instructions for replacing an OSD

* 8/ceph.rst: `rm` subcommand removes osd from osdmap, not the cluster.
  the latter is more ambiguous in different contexts.
* rados/operations/add-or-rm-osds.rst: add a subsection of "Replacing an
  OSD". update the subsection of "Removing the OSD" with "ceph osd
  purge" command
* release-notes.rst: link from it to the new subsection in add-or-rm-osds.rst

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16391 from Yan-waller/wip-walle-0718radososd
Jos Collin [Wed, 19 Jul 2017 02:07:08 +0000 (02:07 +0000)]
Merge pull request #16391 from Yan-waller/wip-walle-0718radososd

osd: combine conditional statements

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agoceph_test_rados_api_watch_notify: flush after unwatch 16402/head
Sage Weil [Tue, 18 Jul 2017 21:42:31 +0000 (17:42 -0400)]
ceph_test_rados_api_watch_notify: flush after unwatch

After we unwatch, we need to make sure the finisher thread has flushed
its work before we tear down the test.  Otherwise, the notify callback
may dereference the test object looking for a member and segfault.

Probably-Fixes: http://tracker.ceph.com/issues/20105
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16401 from bstillwell/releases-doc-update-20170718
Gregory Farnum [Tue, 18 Jul 2017 20:54:14 +0000 (13:54 -0700)]
Merge pull request #16401 from bstillwell/releases-doc-update-20170718

Documentation updates for July 2017 releases

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #16372 from dillaman/wip-20643
Mykola Golub [Tue, 18 Jul 2017 20:53:53 +0000 (23:53 +0300)]
Merge pull request #16372 from dillaman/wip-20643

cls/rbd: trash_list should be iterable

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #16397 from liewegas/wip-20647
Gregory Farnum [Tue, 18 Jul 2017 20:27:29 +0000 (13:27 -0700)]
Merge pull request #16397 from liewegas/wip-20647

mon/MgrMonitor: fix standby addition to mgrmap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoDocumentation updates for July 2017 releases 16401/head
Bryan Stillwell [Tue, 18 Jul 2017 19:53:02 +0000 (13:53 -0600)]
Documentation updates for July 2017 releases

Updates for three new releases this month.  Two new Jewel releases
(10.2.8 and 10.2.9) and one new Luminous release candidate (12.1.1).

Signed-off-by: Bryan Stillwell <bstillwell@godaddy.com>
8 years agoMerge pull request #16350 from ceph/wip-cd-docs-update
vasukulkarni [Tue, 18 Jul 2017 19:31:59 +0000 (12:31 -0700)]
Merge pull request #16350 from ceph/wip-cd-docs-update

[docs/quick-start]: update quick start to add a note for mgr create command for luminous+ builds

8 years agocrush: s/ruleset/id/ in decompiled output 16400/head
Sage Weil [Tue, 18 Jul 2017 18:58:19 +0000 (14:58 -0400)]
crush: s/ruleset/id/ in decompiled output

Moving away from the 'ruleset' terminology.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/MgrMonitor: fix standby addition to mgrmap 16397/head
Sage Weil [Tue, 18 Jul 2017 18:20:48 +0000 (14:20 -0400)]
mon/MgrMonitor: fix standby addition to mgrmap

Inadvertantly removed by ba45fba01c96bcae5b55c50a6076bb1e879d58b9

Fixes: http://tracker.ceph.com/issues/20647
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15432 from dachary/wip-osd-new
Sage Weil [Tue, 18 Jul 2017 18:12:51 +0000 (13:12 -0500)]
Merge pull request #15432 from dachary/wip-osd-new

ceph-disk: support osd new

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge remote-tracking branch 'gh/luminous'
Sage Weil [Tue, 18 Jul 2017 17:52:09 +0000 (13:52 -0400)]
Merge remote-tracking branch 'gh/luminous'