]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 agoMerge pull request #16545 from asomers/install-deps
Sage Weil [Tue, 25 Jul 2017 14:00:02 +0000 (09:00 -0500)]
Merge pull request #16545 from asomers/install-deps

install-deps.sh: add missing dependencies for FreeBSD

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #16564 from liewegas/wip-vstart-mgr
Sage Weil [Tue, 25 Jul 2017 13:56:12 +0000 (08:56 -0500)]
Merge pull request #16564 from liewegas/wip-vstart-mgr

vstart.sh: fix mgr vs restful command startup race

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
7 years agovstart.sh: fix mgr vs restful command startup race 16564/head
Sage Weil [Tue, 25 Jul 2017 13:20:29 +0000 (09:20 -0400)]
vstart.sh: fix mgr vs restful command startup race

If the mgr hasn't activated yet we won't have registered the python
commands.  Use 'ceph tell mgr ...' to ensure we block.  (This is only a
problem right after mkfs when the first mgr hasn't started yet.)

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16497 from weiqiaomiao/wip_weiqm_rgw_compile_warn
Jos Collin [Tue, 25 Jul 2017 11:01:34 +0000 (11:01 +0000)]
Merge pull request #16497 from weiqiaomiao/wip_weiqm_rgw_compile_warn

rgw: Drop dump_usage_bucket_info() to silence warning from -Wunused-function

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #16394 from jcsp/wip-pr-docs
Kefu Chai [Tue, 25 Jul 2017 07:28:26 +0000 (15:28 +0800)]
Merge pull request #16394 from jcsp/wip-pr-docs

doc: add doc requirements on PR submitters

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16038 from ztczll/ztczll
Jos Collin [Tue, 25 Jul 2017 05:32:14 +0000 (05:32 +0000)]
Merge pull request #16038 from ztczll/ztczll

.mailmap, .organizationmap: Update ztczll affiliation

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years ago.mailmap, .organizationmap: Update ztczll affiliation 16038/head
zhanglei [Tue, 25 Jul 2017 03:49:16 +0000 (23:49 -0400)]
.mailmap, .organizationmap: Update ztczll affiliation

Signed-off-by: zhanglei <243290414@qq.com>
7 years agoMerge pull request #16468 from gmayyyha/mgr-show-rbd-features
Jason Dillaman [Tue, 25 Jul 2017 01:11:33 +0000 (21:11 -0400)]
Merge pull request #16468 from gmayyyha/mgr-show-rbd-features

mgr/dashboard: show rbd image features

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
7 years agomgr/dashboard: rbd image show features 16468/head
Yanhu Cao [Fri, 21 Jul 2017 02:02:39 +0000 (10:02 +0800)]
mgr/dashboard: rbd image show features

Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
7 years agoMerge pull request #16537 from shangzhong/wip-update-organization
Kefu Chai [Tue, 25 Jul 2017 00:17:02 +0000 (08:17 +0800)]
Merge pull request #16537 from shangzhong/wip-update-organization

mailmap: add affiliation for Zhu Shangzhong

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
7 years agoMerge pull request #16427 from shangzhong/wip-20685
Kefu Chai [Tue, 25 Jul 2017 00:02:12 +0000 (08:02 +0800)]
Merge pull request #16427 from shangzhong/wip-20685

ceph-disk: s/ceph_osd_mkfs/command_check_call/

Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16362 from tchaikov/wip-ceph-disk
Kefu Chai [Tue, 25 Jul 2017 00:00:56 +0000 (08:00 +0800)]
Merge pull request #16362 from tchaikov/wip-ceph-disk

ceph-disk: use '-' for feeding ceph cli with stdin

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoinstall-deps.sh: add missing dependencies for FreeBSD 16545/head
Alan Somers [Mon, 24 Jul 2017 16:20:19 +0000 (10:20 -0600)]
install-deps.sh: add missing dependencies for FreeBSD

Signed-off-by: Alan Somers <asomers@gmail.com>
7 years agoMerge pull request #16399 from batrick/cephfs-ptl-change
Sage Weil [Mon, 24 Jul 2017 17:48:02 +0000 (12:48 -0500)]
Merge pull request #16399 from batrick/cephfs-ptl-change

AUTHORS: update CephFS PTL

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
7 years agodoc: update CephFS PTL 16399/head
Patrick Donnelly [Tue, 18 Jul 2017 18:49:20 +0000 (11:49 -0700)]
doc: update CephFS PTL

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #16509 from liewegas/wip-rgw-wait
Sage Weil [Mon, 24 Jul 2017 16:55:54 +0000 (11:55 -0500)]
Merge pull request #16509 from liewegas/wip-rgw-wait

qa/suits/rados/basic/tasks/rgw_snaps: wait for pools to be created

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoceph-disk: s|/dev/fd/0|-| 16362/head
Kefu Chai [Wed, 19 Jul 2017 05:02:40 +0000 (13:02 +0800)]
ceph-disk: s|/dev/fd/0|-|

3a4931b allows ceph cli to use '-' to denote stdin/stdout, so use it
instead of /dev/fd/0.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agodoc/dev/ceph-disk: add docs for ceph-disk
Kefu Chai [Mon, 17 Jul 2017 08:49:12 +0000 (16:49 +0800)]
doc/dev/ceph-disk: add docs for ceph-disk

we might want to move part of it to user-facing docs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16437 from tchaikov/wip-doc-fixes
Sage Weil [Mon, 24 Jul 2017 16:02:54 +0000 (11:02 -0500)]
Merge pull request #16437 from tchaikov/wip-doc-fixes

doc: update ceph(8) man page with new sub-commands

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16417 from fangyuxiangGL/rgw-hang
Yuri Weinstein [Mon, 24 Jul 2017 15:30:38 +0000 (08:30 -0700)]
Merge pull request #16417 from fangyuxiangGL/rgw-hang

rgw: fix rgw hang when do RGWRealmReloader::reload after go SIGHUP

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #16422 from theanalyst/rgw-lc-log-fix
Yuri Weinstein [Mon, 24 Jul 2017 15:29:36 +0000 (08:29 -0700)]
Merge pull request #16422 from theanalyst/rgw-lc-log-fix

rgw: fix asctime when logging in rgw_lc

Reviewed-by: Daniel Gryniewicz <dang@fprintf.net>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@linuxbox.com>
7 years agoceph-disk: s/ceph_osd_mkfs/command_check_call/ 16427/head
Shangzhong Zhu [Wed, 19 Jul 2017 14:53:49 +0000 (22:53 +0800)]
ceph-disk: s/ceph_osd_mkfs/command_check_call/
Fixes: http://tracker.ceph.com/issues/20685
Signed-off-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
7 years agoUpdate my organization and mail 16537/head
Zhu Shangzhong [Mon, 24 Jul 2017 15:01:05 +0000 (23:01 +0800)]
Update my organization and mail

Signed-off-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
7 years agoMerge pull request #16524 from dingdangzhang/master
Jos Collin [Mon, 24 Jul 2017 14:53:13 +0000 (14:53 +0000)]
Merge pull request #16524 from dingdangzhang/master

msg/async: use auto iterator having more simple code and good performance

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #16481 from nikitych/bug20706
Kefu Chai [Mon, 24 Jul 2017 14:03:10 +0000 (22:03 +0800)]
Merge pull request #16481 from nikitych/bug20706

ceph-disk: Fix for missing 'not' in *_is_diskdevice checks

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16247 from shangzhong/wip-20556
Kefu Chai [Mon, 24 Jul 2017 14:02:48 +0000 (22:02 +0800)]
Merge pull request #16247 from shangzhong/wip-20556

ceph-disk: change the lockbox partition number to 5

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #13723 from ovh/bp-forced-recovery
Sage Weil [Mon, 24 Jul 2017 14:01:03 +0000 (09:01 -0500)]
Merge pull request #13723 from ovh/bp-forced-recovery

osd/PG: make prioritized recovery possible

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #16504 from Yan-waller/wip-walle-0721osdclients
Sage Weil [Mon, 24 Jul 2017 13:59:37 +0000 (08:59 -0500)]
Merge pull request #16504 from Yan-waller/wip-walle-0721osdclients

osd: fix OpRequest and tracked op dump information

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #16512 from liupan1111/wip-fix-latency
Sage Weil [Mon, 24 Jul 2017 13:59:01 +0000 (08:59 -0500)]
Merge pull request #16512 from liupan1111/wip-fix-latency

common: the latency dumped by "ceph osd perf" is not real

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16518 from liewegas/wip-20751
Sage Weil [Mon, 24 Jul 2017 13:57:39 +0000 (08:57 -0500)]
Merge pull request #16518 from liewegas/wip-20751

mon/OSDMonitor: remove zeroed new_state updates

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16365 from jcsp/wip-osd-marked-me-down
John Spray [Mon, 24 Jul 2017 13:55:41 +0000 (14:55 +0100)]
Merge pull request #16365 from jcsp/wip-osd-marked-me-down

osd: rephrase "wrongly marked me down" clog message

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoqa: update whitelist for "wrongly marked me down" 16365/head
John Spray [Mon, 17 Jul 2017 12:29:27 +0000 (08:29 -0400)]
qa: update whitelist for "wrongly marked me down"

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoosd: rephrase "wrongly marked me down" clog message
John Spray [Sun, 16 Jul 2017 13:50:40 +0000 (09:50 -0400)]
osd: rephrase "wrongly marked me down" clog message

Rephrase as "Monitor daemon marked osd.<id> down, but it is
still running", which is more descriptive.  Demote the
epoch information to DEBUG level.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #16326 from liewegas/wip-weight-set
Sage Weil [Mon, 24 Jul 2017 13:27:06 +0000 (08:27 -0500)]
Merge pull request #16326 from liewegas/wip-weight-set

crush,mon: add weight-set introspection and manipulation commands

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com
7 years agouse auto iterator having more simple code and good performence 16524/head
dingdangzhang [Mon, 24 Jul 2017 09:14:17 +0000 (17:14 +0800)]
use auto iterator having more simple code and good performence

Signed-off-by: dingdangzhang <boqian.zy@alibaba-inc.com>
7 years agoMerge pull request #16360 from dillaman/wip-rbd-mirror-service-daemon
John Spray [Mon, 24 Jul 2017 13:00:51 +0000 (14:00 +0100)]
Merge pull request #16360 from dillaman/wip-rbd-mirror-service-daemon

mgr/dashboard: rbd mirroring status page

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #16529 from Liuchang0812/wip-20750
John Spray [Mon, 24 Jul 2017 11:40:52 +0000 (12:40 +0100)]
Merge pull request #16529 from Liuchang0812/wip-20750

mgr/status: row has incorrect number of values

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #16503 from renhwztetecs/renhw-wip-mon-rebuild-doc
Kefu Chai [Mon, 24 Jul 2017 11:39:44 +0000 (19:39 +0800)]
Merge pull request #16503 from renhwztetecs/renhw-wip-mon-rebuild-doc

doc/mon: fix ceph-authtool command in rebuild mon's sample

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16523 from tchaikov/wip-ceph-disk-asok-dir
Kefu Chai [Mon, 24 Jul 2017 10:31:37 +0000 (18:31 +0800)]
Merge pull request #16523 from tchaikov/wip-ceph-disk-asok-dir

tests: add setup/teardown for asok dir

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agodoc/rados/operations/add-or-rm-osds: fix dead hyper link 16437/head
Kefu Chai [Thu, 20 Jul 2017 05:07:20 +0000 (13:07 +0800)]
doc/rados/operations/add-or-rm-osds: fix dead hyper link

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agodoc: document "ceph osd set-require-min-compat-client"
Kefu Chai [Thu, 20 Jul 2017 05:06:46 +0000 (13:06 +0800)]
doc: document "ceph osd set-require-min-compat-client"

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomgr/status: row has incorrect number of values 16529/head
liuchang0812 [Mon, 24 Jul 2017 09:34:45 +0000 (17:34 +0800)]
mgr/status: row has incorrect number of values

Fixes: http://tracker.ceph.com/issues/20750
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
7 years agoMerge pull request #16507 from scienceluo/patch-1 16525/head 16555/head
Xie Xingguo [Mon, 24 Jul 2017 09:28:24 +0000 (17:28 +0800)]
Merge pull request #16507 from scienceluo/patch-1

Update .organizationmap

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agodoc/mon: fix ceph-authtool create keyring 16503/head
huanwen ren [Sat, 22 Jul 2017 08:06:45 +0000 (16:06 +0800)]
doc/mon: fix ceph-authtool create keyring

if use "ceph-authtool keyring -n mon. --cap mon allow 'allow *'"
as err:
[root]# ceph-authtool keyring -n mon. --cap mon allow 'allow *'
ceph-authtool: unexpected 'allow *'

Excessive "allow" is the cause of the error

Signed-off-by huanwen ren <ren.huanwen@zte.com.cn>

7 years agodoc: document "ceph features"
Kefu Chai [Thu, 20 Jul 2017 05:05:44 +0000 (13:05 +0800)]
doc: document "ceph features"

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agovstart.sh: do not try to remove default asok_dir 16523/head
Kefu Chai [Mon, 24 Jul 2017 08:38:13 +0000 (16:38 +0800)]
vstart.sh: do not try to remove default asok_dir

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agotests: add setup/teardown for asok dir
Kefu Chai [Mon, 24 Jul 2017 08:31:06 +0000 (16:31 +0800)]
tests: add setup/teardown for asok dir

ceph-disk.sh has its own setup/teardown, so update them also. so asok
files will have their parent directory when being created.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16502 from weiqiaomiao/wip_weiqm_unlock_bucket
Orit Wasserman [Mon, 24 Jul 2017 08:25:21 +0000 (11:25 +0300)]
Merge pull request #16502 from weiqiaomiao/wip_weiqm_unlock_bucket

rgw: should unlock when reshard_log->update() reture non-zero in RGWB…
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agorgw: Drop Unused function in rgw_usage.cc 16497/head
weiqiaomiao [Sat, 22 Jul 2017 00:53:58 +0000 (08:53 +0800)]
rgw: Drop Unused function in rgw_usage.cc

fix compile warnning in any PR (Ex: https://jenkins.ceph.com/job/ceph-pull-requests/29193/console):
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_usage.cc:33:13: warning: ‘void dump_usage_bucket_info(ceph::Formatter*, std::__cxx11::string&, cls_user_bucket_entry&)’ defined but not used [-Wunused-function]
 static void dump_usage_bucket_info(Formatter *formatter, string& name, cls_user_bucket_entry& entry)

Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
8 years agorgw: should unlock when reshard_log->update() reture non-zero in RGWBucketReshard... 16502/head
weiqiaomiao [Sat, 22 Jul 2017 05:43:10 +0000 (13:43 +0800)]
rgw: should unlock when reshard_log->update() reture non-zero in RGWBucketReshard::execute()

Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
8 years agoosd/OSDMap: fix Incremental::dump 16518/head
Sage Weil [Sun, 23 Jul 2017 14:26:57 +0000 (10:26 -0400)]
osd/OSDMap: fix Incremental::dump

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: remove zeroed new_state updates
Sage Weil [Sun, 23 Jul 2017 14:26:47 +0000 (10:26 -0400)]
mon/OSDMonitor: remove zeroed new_state updates

These are interpreted as CEPH_OSD_UP in apply_incremental for legacy
reasons--we don't want them!

Fixes: http://tracker.ceph.com/issues/20751
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon: the latency dumped by "ceph osd perf" is not real 16512/head
Pan Liu [Sun, 23 Jul 2017 07:55:47 +0000 (15:55 +0800)]
common: the latency dumped by "ceph osd perf" is not real

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
8 years agoMerge pull request #16508 from liewegas/wip-mgr-lock-cycle
Sage Weil [Sun, 23 Jul 2017 02:14:36 +0000 (21:14 -0500)]
Merge pull request #16508 from liewegas/wip-mgr-lock-cycle

mgr: fix lock cycle

8 years agoqa/suites/rados/basic/tasks/rgw_snaps: wait for pools to be be created 16509/head
Sage Weil [Sat, 22 Jul 2017 22:54:18 +0000 (18:54 -0400)]
qa/suites/rados/basic/tasks/rgw_snaps: wait for pools to be be created

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/suites/rados/basic/tasks/rgw_snaps: fix pool list
Sage Weil [Sat, 22 Jul 2017 22:54:32 +0000 (18:54 -0400)]
qa/suites/rados/basic/tasks/rgw_snaps: fix pool list

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16488 from liewegas/wip-skewed
Sage Weil [Sat, 22 Jul 2017 18:07:43 +0000 (13:07 -0500)]
Merge pull request #16488 from liewegas/wip-skewed

common/options: remove mon_warn_osd_usage_min_max_delta from options.cc too

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #16490 from jdurgin/wip-20739
Sage Weil [Sat, 22 Jul 2017 18:07:28 +0000 (13:07 -0500)]
Merge pull request #16490 from jdurgin/wip-20739

osd/PrimaryLogPG: skip deleted missing objects in pg[n]ls

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16501 from liewegas/wip-fix-mgr-commands
Sage Weil [Sat, 22 Jul 2017 18:07:05 +0000 (13:07 -0500)]
Merge pull request #16501 from liewegas/wip-fix-mgr-commands

mon: do not dereference empty mgr_commands

8 years agoMerge pull request #16500 from liewegas/wip-compact-sudo
Sage Weil [Sat, 22 Jul 2017 18:01:20 +0000 (13:01 -0500)]
Merge pull request #16500 from liewegas/wip-compact-sudo

qa/workunits/cephtool/test.sh: add sudo for daemon compact

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomgr/PyModules: fix lock name 16508/head
Sage Weil [Sat, 22 Jul 2017 17:48:17 +0000 (13:48 -0400)]
mgr/PyModules: fix lock name

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomgr/DaemonServer: fix lock cycle
Sage Weil [Sat, 22 Jul 2017 17:48:00 +0000 (13:48 -0400)]
mgr/DaemonServer: fix lock cycle

This breaks a lock cycle with DaemonState::lock and PyModules::lock.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoUpdate .organizationmap 16507/head
luokexue [Sat, 22 Jul 2017 15:11:09 +0000 (23:11 +0800)]
Update .organizationmap

The list of contributors to ZTE looks better if it is in alphabetical order.

Signed-off-by: Luo Kexue luo.kexue@zte.com.cn
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 #15991 from dillaman/wip-rbd-auth-profile
Sage Weil [Sat, 22 Jul 2017 03:38:42 +0000 (22:38 -0500)]
Merge pull request #15991 from dillaman/wip-rbd-auth-profile

mon,osd: new rbd-based cephx cap profiles

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16432 from liewegas/wip-mgr-daemonstate-lock
Sage Weil [Sat, 22 Jul 2017 03:36:26 +0000 (22:36 -0500)]
Merge pull request #16432 from liewegas/wip-mgr-daemonstate-lock

mgr: add per-DaemonState lock

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #16460 from liewegas/wip-mgr-metadata
Sage Weil [Sat, 22 Jul 2017 03:36:09 +0000 (22:36 -0500)]
Merge pull request #16460 from liewegas/wip-mgr-metadata

mon: add mgr metdata commands, and overall 'versions' command for all daemon versions

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16465 from xiexingguo/wip-shutup-noscrub-warn
Sage Weil [Sat, 22 Jul 2017 03:35:43 +0000 (22:35 -0500)]
Merge pull request #16465 from xiexingguo/wip-shutup-noscrub-warn

mon: stop issuing not-[deep]-scrubbed warnings if disabled

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16477 from tchaikov/wip-health-mon
Sage Weil [Sat, 22 Jul 2017 03:34:50 +0000 (22:34 -0500)]
Merge pull request #16477 from tchaikov/wip-health-mon

mon/HealthMonitor: trigger a proposal if stat updated

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #16478 from xiexingguo/wip-drop-empty-message
Sage Weil [Sat, 22 Jul 2017 03:34:32 +0000 (22:34 -0500)]
Merge pull request #16478 from xiexingguo/wip-drop-empty-message

mon/HealthMonitor: avoid sending unnecessary MMonHealthChecks to leader

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16480 from jcsp/wip-rm-convert
Sage Weil [Sat, 22 Jul 2017 03:34:08 +0000 (22:34 -0500)]
Merge pull request #16480 from jcsp/wip-rm-convert

common: remove config opt conversion utility

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
8 years agomon: do not dereference empty mgr_commands 16501/head
Sage Weil [Sat, 22 Jul 2017 03:31:55 +0000 (23:31 -0400)]
mon: do not dereference empty mgr_commands

This may be empty before the initial quorum commits the static command
list.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/workunits/cephtool/test.sh: add sudo for daemon compact 16500/head
Sage Weil [Sat, 22 Jul 2017 03:18:03 +0000 (23:18 -0400)]
qa/workunits/cephtool/test.sh: add sudo for daemon compact

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge PR 16390 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:23:10 +0000 (13:23 -0700)]
Merge PR 16390 into master

* refs/remotes/upstream/pull/16390/head:
mds: cleanup with unique_ptr
mds: add to get version in the mds_commands
mds: cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge PR 16379 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:23:07 +0000 (13:23 -0700)]
Merge PR 16379 into master

* refs/remotes/upstream/pull/16379/head:
qa: fix MDS_CLIENT_RECALL copy error

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16337 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:23:04 +0000 (13:23 -0700)]
Merge PR 16337 into master

* refs/remotes/upstream/pull/16337/head:
mds: clear dirty rstat flag on non-auth inode when finishing scatter update

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16280 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:23:01 +0000 (13:23 -0700)]
Merge PR 16280 into master

* refs/remotes/upstream/pull/16280/head:
Client: mkdirs bugs when two clients send mkdir request for a same dir

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16278 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:58 +0000 (13:22 -0700)]
Merge PR 16278 into master

* refs/remotes/upstream/pull/16278/head:
MDSMonitor: show laggy MDSs at higher debug level

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16270 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:56 +0000 (13:22 -0700)]
Merge PR 16270 into master

* refs/remotes/upstream/pull/16270/head:
mds: improve wording of mdsmap dne logging

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16232 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:53 +0000 (13:22 -0700)]
Merge PR 16232 into master

* refs/remotes/upstream/pull/16232/head:
MDS: update the mlogger of mds in function check_memory_usage

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16231 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:50 +0000 (13:22 -0700)]
Merge PR 16231 into master

* refs/remotes/upstream/pull/16231/head:
Client: get rid of variable "butnot" in "client::get_caps"

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16226 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:47 +0000 (13:22 -0700)]
Merge PR 16226 into master

* refs/remotes/upstream/pull/16226/head:
qa: wait for OSDMap to propagate for snap purge

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16149 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:44 +0000 (13:22 -0700)]
Merge PR 16149 into master

* refs/remotes/upstream/pull/16149/head:
mds: misc cleanup

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 15942 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:36 +0000 (13:22 -0700)]
Merge PR 15942 into master

* refs/remotes/upstream/pull/15942/head:
client: add unlock_fh_pos when abort

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agocrush: assume weight_set != null imples weight_set_size > 0 16326/head
Sage Weil [Fri, 21 Jul 2017 19:18:10 +0000 (15:18 -0400)]
crush: assume weight_set != null imples weight_set_size > 0

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/PrimaryLogPG: skip deleted missing objects in pg[n]ls 16490/head
Josh Durgin [Fri, 21 Jul 2017 19:02:53 +0000 (15:02 -0400)]
osd/PrimaryLogPG: skip deleted missing objects in pg[n]ls

Fixes: http://tracker.ceph.com/issues/20739
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoPendingReleaseNotes: added blurb for new RBD cap profiles 15991/head
Jason Dillaman [Wed, 19 Jul 2017 20:43:13 +0000 (16:43 -0400)]
PendingReleaseNotes: added blurb for new RBD cap profiles

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoosd: expand profile caps upon construction to avoid potential race
Jason Dillaman [Tue, 11 Jul 2017 12:09:26 +0000 (08:09 -0400)]
osd: expand profile caps upon construction to avoid potential race

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoqa/workunits/rbd: rbd-mirror tests should use 'mirror' user
Jason Dillaman [Mon, 10 Jul 2017 17:03:11 +0000 (13:03 -0400)]
qa/workunits/rbd: rbd-mirror tests should use 'mirror' user

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoqa/suites/rbd: mirroring tests should use rbd cap profiles
Jason Dillaman [Fri, 7 Jul 2017 17:05:34 +0000 (13:05 -0400)]
qa/suites/rbd: mirroring tests should use rbd cap profiles

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoqa/workunits/rbd: devstack test should use auth profiles
Jason Dillaman [Fri, 7 Jul 2017 17:10:11 +0000 (13:10 -0400)]
qa/workunits/rbd: devstack test should use auth profiles

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agodoc: include details for new RBD cap profiles
Jason Dillaman [Fri, 7 Jul 2017 14:41:07 +0000 (10:41 -0400)]
doc: include details for new RBD cap profiles

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon,osd: drop the "allow" prefix for profile caps
Jason Dillaman [Fri, 30 Jun 2017 13:58:36 +0000 (09:58 -0400)]
mon,osd: drop the "allow" prefix for profile caps

The use of the a profile implies that it sets everything up. If
support for deny is ever added, it doesn't make much sense to
deny a profile.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoosd: new 'rbd'/'rbd-read-only' osd cap profiles
Jason Dillaman [Thu, 29 Jun 2017 01:42:41 +0000 (21:42 -0400)]
osd: new 'rbd'/'rbd-read-only' osd cap profiles

The 'rbd' profile provides read-only class access on all pools
to the 'rbd_children' object and write access to the optionally
specified pool. The 'rbd-read-only' profile does as its name
implies.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoosd: primitive cephx osd profile cap support
Jason Dillaman [Thu, 29 Jun 2017 01:20:09 +0000 (21:20 -0400)]
osd: primitive cephx osd profile cap support

The two new example profiles are read-only and read-write

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: added 'rbd' profile
Jason Dillaman [Mon, 26 Jun 2017 20:56:23 +0000 (16:56 -0400)]
mon: added 'rbd' profile

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: support regex-based restrictions on command caps
Jason Dillaman [Mon, 26 Jun 2017 20:38:15 +0000 (16:38 -0400)]
mon: support regex-based restrictions on command caps

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #16445 from tchaikov/wip-16895
Kefu Chai [Fri, 21 Jul 2017 18:24:28 +0000 (02:24 +0800)]
Merge pull request #16445 from tchaikov/wip-16895

test: create asok files in a temp directory under $TMPDIR

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>