]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agorgw: use namespace for roles pool 16889/head
Orit Wasserman [Tue, 8 Aug 2017 08:24:06 +0000 (11:24 +0300)]
rgw:  use namespace for roles pool

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
7 years agorgw: initialize lc pool as namespace
Orit Wasserman [Tue, 8 Aug 2017 08:22:42 +0000 (11:22 +0300)]
rgw: initialize lc pool as namespace

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Fixes: http://tracker.ceph.com/issues/20177
7 years agoMerge pull request #16123 from ddiss/fix-journal-supression
Kefu Chai [Wed, 26 Jul 2017 04:02:14 +0000 (12:02 +0800)]
Merge pull request #16123 from ddiss/fix-journal-supression

ceph-disk: don't activate suppressed journal devices

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16498 from Songweibin/wip-doc-rbd-trash-cli
Sage Weil [Wed, 26 Jul 2017 02:49:26 +0000 (21:49 -0500)]
Merge pull request #16498 from Songweibin/wip-doc-rbd-trash-cli

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

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

doc: document mClock related options

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16534 from liewegas/wip-20751
Sage Weil [Wed, 26 Jul 2017 02:31:47 +0000 (21:31 -0500)]
Merge pull request #16534 from liewegas/wip-20751

mon/OSDMonitor: ensure UP is not set for newly-created OSDs

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16469 from xiexingguo/wip-fix-test
Sage Weil [Wed, 26 Jul 2017 02:04:22 +0000 (21:04 -0500)]
Merge pull request #16469 from xiexingguo/wip-fix-test

test: s/osd_objectstore_type/osd_objectstore

7 years agodoc: add new trash cli in rados-rbd-cmds.rst 16498/head
songweibin [Sat, 22 Jul 2017 07:09:25 +0000 (15:09 +0800)]
doc: add new trash cli in rados-rbd-cmds.rst

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

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agoMerge pull request #15693 from dillaman/wip-osd-cmpext-ec-pool
Josh Durgin [Tue, 25 Jul 2017 20:52:20 +0000 (13:52 -0700)]
Merge pull request #15693 from dillaman/wip-osd-cmpext-ec-pool

osd: support cmpext operation on EC-backed pools

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #16527 from jcsp/wip-options-followup
Sage Weil [Tue, 25 Jul 2017 20:48:45 +0000 (15:48 -0500)]
Merge pull request #16527 from jcsp/wip-options-followup

common: follow up to new options infrastructure

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16511 from c744402859/master
Yuri Weinstein [Tue, 25 Jul 2017 20:46:25 +0000 (13:46 -0700)]
Merge pull request #16511 from c744402859/master

OSDMonitor: check mon_max_pool_pg_num when set pool pg_num

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #16560 from nrdmn/patch-3
Sage Weil [Tue, 25 Jul 2017 20:21:50 +0000 (15:21 -0500)]
Merge pull request #16560 from nrdmn/patch-3

pybind/mgr/restful: fix typo

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

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

7 years agoMerge pull request #16536 from jdurgin/wip-20747
Sage Weil [Tue, 25 Jul 2017 19:05:15 +0000 (14:05 -0500)]
Merge pull request #16536 from jdurgin/wip-20747

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

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

osd/PGLog: fix inaccurate missing assert

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

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

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

mgr/MgrClient: do not attempt to access a global variable for config

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16385 from mikulely/3-check-target-when-create-bucket
Casey Bodley [Tue, 25 Jul 2017 15:38:24 +0000 (11:38 -0400)]
Merge pull request #16385 from mikulely/3-check-target-when-create-bucket

rgw: check placement existence when create bucket

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #16540 from cbodley/wip-mrgw-admin-socket
Kefu Chai [Tue, 25 Jul 2017 15:19:01 +0000 (23:19 +0800)]
Merge pull request #16540 from cbodley/wip-mrgw-admin-socket

rgw: restore admin socket path in mrgw.sh

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16513 from liewegas/wip-standalone
Sage Weil [Tue, 25 Jul 2017 14:51:36 +0000 (09:51 -0500)]
Merge pull request #16513 from liewegas/wip-standalone

qa: move ceph-helpers-based make check tests to qa/standalone; run via teuthology

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #16566 from jcsp/wip-doc-health
Sage Weil [Tue, 25 Jul 2017 14:36:49 +0000 (09:36 -0500)]
Merge pull request #16566 from jcsp/wip-doc-health

doc/rados: add page for health checks and update monitoring.rst

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc/rados: add page for health checks and update monitoring.rst 16566/head
John Spray [Tue, 25 Jul 2017 14:13:02 +0000 (15:13 +0100)]
doc/rados: add page for health checks and update monitoring.rst

Signed-off-by: John Spray <john.spray@redhat.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 agoceph-disk/tests/ceph-disk.sh: wait for right number of pgs 16513/head
Sage Weil [Tue, 25 Jul 2017 13:51:22 +0000 (09:51 -0400)]
ceph-disk/tests/ceph-disk.sh: wait for right number of pgs

Signed-off-by: Sage Weil <sage@redhat.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 agodoc: document mClock related options 16552/head
Kefu Chai [Tue, 25 Jul 2017 03:02:25 +0000 (11:02 +0800)]
doc: document mClock related options

* rados/configuration/osd-config-ref.rst: document mClock related
  options
* release-notes.rst: fix syntax errors. link QoS to mClock related docs.

Signed-off-by: Kefu Chai <kchai@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 agoqa/run-standalone.sh: helper to run all standalone tests
Sage Weil [Mon, 24 Jul 2017 21:45:22 +0000 (17:45 -0400)]
qa/run-standalone.sh: helper to run all standalone tests

Nothing fancy, but documents how these are run.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomds/MDSMap: init mds_features
Sage Weil [Mon, 24 Jul 2017 20:25:32 +0000 (16:25 -0400)]
mds/MDSMap: init mds_features

This can lead to ceph-dencoder reencode failures.  Doesn't matter too
much in the real world since body decodes these ancient mds_info_t
structs.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/standalone/scrub: separate scrub/repair tests from rest of osd/
Sage Weil [Mon, 24 Jul 2017 02:05:59 +0000 (22:05 -0400)]
qa/standalone/scrub: separate scrub/repair tests from rest of osd/

They are slow.  Run them separately.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/standalone/ceph-helpers: factor rbd pool create out of run_mon
Sage Weil [Fri, 21 Jul 2017 22:01:23 +0000 (18:01 -0400)]
qa/standalone/ceph-helpers: factor rbd pool create out of run_mon

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/standalone/mon/osd-pool-create: stop testing create pool output
Sage Weil [Sat, 22 Jul 2017 19:28:58 +0000 (15:28 -0400)]
qa/standalone/mon/osd-pool-create: stop testing create pool output

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa: move ceph-helpers and misc src/test/*.sh tests to qa/standalone
Sage Weil [Fri, 21 Jul 2017 02:54:48 +0000 (22:54 -0400)]
qa: move ceph-helpers and misc src/test/*.sh tests to qa/standalone

- stop running via make check
- add teuthology yamls to run them
- disable ceph_objecstore_tool.py for now (too slow for make check, and
we can't use vstart in teuthology via a package install)
- drop cephtool tests since those are already covered by other teuthology
tests
- leave a handful of (fast!) ceph-helpers tests for make check for minimal
integration tests.

Signed-off-by: Sage Weil <sage@redhat.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 agomgr/MgrClient: do not attempt to access a global variable for config 16544/head
Jason Dillaman [Mon, 24 Jul 2017 22:17:59 +0000 (18:17 -0400)]
mgr/MgrClient: do not attempt to access a global variable for config

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/workunits/cephtool/test.sh: disable 'fs status' until bug is fixed 16541/head
Sage Weil [Mon, 24 Jul 2017 20:54:13 +0000 (16:54 -0400)]
qa/workunits/cephtool/test.sh: disable 'fs status' until bug is fixed

See http://tracker.ceph.com/issues/20761
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agodeb,rpm: require socat for ceph-test
Sage Weil [Fri, 21 Jul 2017 02:45:47 +0000 (22:45 -0400)]
deb,rpm: require socat for ceph-test

Used by qa/standalone/mon/mon-bind.sh.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agounittest_compression: speed it up
Sage Weil [Thu, 20 Jul 2017 21:24:03 +0000 (17:24 -0400)]
unittest_compression: speed it up

~4m -> ~25s

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/tasks/workunit: allow alt basedir
Sage Weil [Thu, 20 Jul 2017 18:58:09 +0000 (14:58 -0400)]
qa/tasks/workunit: allow alt basedir

Instead of 'qa/workunits' allow something like 'qa/standalone'.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph: drop --admin-socket warning/error on ceph cli
Sage Weil [Sat, 22 Jul 2017 04:00:24 +0000 (00:00 -0400)]
ceph: drop --admin-socket warning/error on ceph cli

'ceph daemon' has existed for a long time; this has outlived its
usefullness.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorgw: restore admin socket path in mrgw.sh 16540/head
Casey Bodley [Mon, 24 Jul 2017 19:07:17 +0000 (15:07 -0400)]
rgw: restore admin socket path in mrgw.sh

ceph-conf was rejecting the entity name with:

error parsing 'radosgw.8000': expected string of the form TYPE.ID, valid
types are: auth, mon, osd, mds, mgr, client

these mstart/mrun/mrgw scripts carefully place their output files under
their respective run/<cluster-name>/out subdirectory to keep them from
clashing

Signed-off-by: Casey Bodley <cbodley@redhat.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 agoosd/PGLog: fix inaccurate missing assert 16539/head
Josh Durgin [Mon, 24 Jul 2017 16:53:02 +0000 (12:53 -0400)]
osd/PGLog: fix inaccurate missing assert

Repair and EIO handling can add missing items after log.tail

Fixes: http://tracker.ceph.com/issues/20753
Signed-off-by: Josh Durgin <jdurgin@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 agomon/OSDMonitor: ensure UP is not set for newly-created OSDs 16534/head
Sage Weil [Mon, 24 Jul 2017 14:08:56 +0000 (10:08 -0400)]
mon/OSDMonitor: ensure UP is not set for newly-created OSDs

Due to http://tracker.ceph.com/issues/20751 it is possible for the UP
state bit to be set for OSDs without EXISTS.  Make sure it is cleared as
needed when the OSD id is reused.

Signed-off-by: Sage Weil <sage@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 agocommon: remove dead default values from legacy opts 16527/head
John Spray [Mon, 24 Jul 2017 12:19:48 +0000 (08:19 -0400)]
common: remove dead default values from legacy opts

These were dead code and could cause confusion.

The actual default values live in options.cc since
it was added.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agocommon: reinstate freebsd ifdefs in options.cc
John Spray [Mon, 24 Jul 2017 12:19:06 +0000 (08:19 -0400)]
common: reinstate freebsd ifdefs in options.cc

The automated conversion missed these.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agocommon: use code_environment_t for daemon-ness in config
John Spray [Mon, 24 Jul 2017 10:01:36 +0000 (06:01 -0400)]
common: use code_environment_t for daemon-ness in config

...and reinstate the set_daemon_default versions of config options
in place of the special casing in common_init.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agocommon/options: mark all obvious LEVEL_DEV options
John Spray [Sun, 23 Jul 2017 16:46:58 +0000 (12:46 -0400)]
common/options: mark all obvious LEVEL_DEV options

This is everthing matching kill.*at, debug, inject.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agocommon: separate out options by subsystem
John Spray [Sun, 23 Jul 2017 16:34:57 +0000 (12:34 -0400)]
common: separate out options by subsystem

This avoids compiler warning about one oversized
literal, allows us to add_service en-masse to
the whole collection, and avoids potential merge
conflicts when config changes in separate subsystems
are made.

Signed-off-by: John Spray <john.spray@redhat.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 agoOSDMonitor: check mon_max_pool_pg_num when set pool pg_num 16511/head
chenhg [Sun, 23 Jul 2017 09:21:26 +0000 (17:21 +0800)]
OSDMonitor: check mon_max_pool_pg_num when set pool pg_num

Check the mon_max_pool_pg_num when creating pools, but did not

check in the the modification. So we can create a pool and then

modify pg_num exceeds the mon_max_pool_pg_num limit.

By following these steps can verify this problem

step 1: set  mon_max_pool_pg_num = 65536

step 2: ceph osd pool create testpool 65536 65536

step 3: ceph osd pool set testpool pg_num 65537

Signed-off-by: chenhg <c744402859@gmail.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>
7 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>
7 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>
7 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>
7 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 agoosd: PrimaryLogPG, PGBackend: complete callback even if interval changes 16536/head
Josh Durgin [Sun, 23 Jul 2017 06:27:50 +0000 (02:27 -0400)]
osd: PrimaryLogPG, PGBackend: complete callback even if interval changes

This avoids leaking the callback passed to remove_missing_object().
Use EAGAIN to signal that the work was not completed, so we don't have
to take the pg lock and check if the interval changed again in
PGBackend.

Fixes: http://tracker.ceph.com/issues/20747
Signed-off-by: Josh Durgin <jdurgin@redhat.com>