]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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>
8 years agoMerge pull request #16291 from ZVampirEM77/wip-acl-grants-num-limit
Yuri Weinstein [Tue, 18 Jul 2017 14:38:34 +0000 (07:38 -0700)]
Merge pull request #16291 from ZVampirEM77/wip-acl-grants-num-limit

rgw: acl grants num limit

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #16310 from ZVampirEM77/wip-acl-reqdata-too-large
Yuri Weinstein [Tue, 18 Jul 2017 14:38:13 +0000 (07:38 -0700)]
Merge pull request #16310 from ZVampirEM77/wip-acl-reqdata-too-large

rgw: req xml params size limitation error msg

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #16324 from yehudasa/wip-20620
Yuri Weinstein [Tue, 18 Jul 2017 14:37:13 +0000 (07:37 -0700)]
Merge pull request #16324 from yehudasa/wip-20620

rgw: delete object in error path

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15940 from smithfarm/wip-20425
Sage Weil [Tue, 18 Jul 2017 13:41:00 +0000 (08:41 -0500)]
Merge pull request #15940 from smithfarm/wip-20425

build/ops: rpm: put mgr python build dependencies in make_check bcond

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
8 years agoMerge pull request #16283 from xiexingguo/wip-osd-segfault
Sage Weil [Tue, 18 Jul 2017 13:40:34 +0000 (08:40 -0500)]
Merge pull request #16283 from xiexingguo/wip-osd-segfault

mon, osd: misc fixes

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16353 from tchaikov/wip-20605
Sage Weil [Tue, 18 Jul 2017 13:39:58 +0000 (08:39 -0500)]
Merge pull request #16353 from tchaikov/wip-20605

mon: add force-create-pg back

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16356 from liewegas/wip-mgr-early-health
Sage Weil [Tue, 18 Jul 2017 13:39:39 +0000 (08:39 -0500)]
Merge pull request #16356 from liewegas/wip-mgr-early-health

mon/MgrMonitor: only induce mgr epoch shortly after mkfs

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #16359 from liewegas/wip-cli-stdinout
Sage Weil [Tue, 18 Jul 2017 13:39:14 +0000 (08:39 -0500)]
Merge pull request #16359 from liewegas/wip-cli-stdinout

ceph: allow '-' with -i and -o for stdin/stdout

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
8 years agoMerge pull request #16364 from liupan1111/wip-fix-clean
Sage Weil [Tue, 18 Jul 2017 13:38:59 +0000 (08:38 -0500)]
Merge pull request #16364 from liupan1111/wip-fix-clean

os/bluestore: use reference to avoid string copy

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16366 from smithfarm/wip-babeltrace-typo
Sage Weil [Tue, 18 Jul 2017 13:38:37 +0000 (08:38 -0500)]
Merge pull request #16366 from smithfarm/wip-babeltrace-typo

build/ops: rpm: fix typo WTIH_BABELTRACE

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #16261 from tchaikov/wip-ceph-release-notes-py3
Kefu Chai [Tue, 18 Jul 2017 12:27:58 +0000 (20:27 +0800)]
Merge pull request #16261 from tchaikov/wip-ceph-release-notes-py3

tools: ceph-release-notes: port it to py3

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoMerge pull request #16380 from mikulely/doc-index-typos
Jos Collin [Tue, 18 Jul 2017 08:17:10 +0000 (08:17 +0000)]
Merge pull request #16380 from mikulely/doc-index-typos

test,rgw: fix rgw placement rule pool config option

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agotest,rgw: fix rgw placement rule pool config option 16380/head
Jiaying Ren [Tue, 18 Jul 2017 05:56:30 +0000 (13:56 +0800)]
test,rgw: fix rgw placement rule pool config option

actually we're checking '--index-pool' & `--max-buckets` during
the argument parsing.

same as 3af3f4e84ca226f63f7491eb64195d07419a3e1e

Signed-off-by: Jiaying Ren jiaying.ren@umcloud.com
8 years agoMerge PR 16068 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:33:51 +0000 (22:33 -0700)]
Merge PR 16068 into master

* refs/remotes/upstream/pull/16068/head:
mds: wait auth pinned objects when deactivating mds
mds: fix "wait for stray manager to start"
ceph: kick purge queue when mds active
mds: properly do null snapflush
mds: force client to flush data when waiting on LOCK_SNAP_SYNC lock
mds: don't issue caps for frozen inode

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge PR 16202 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:33:49 +0000 (22:33 -0700)]
Merge PR 16202 into master

* refs/remotes/upstream/pull/16202/head:
doc: add some docs about 'cephfs-data-scan scan_links'
mds/FSMap.cc: remember stopped mds when resetting filesystem
tools/cephfs: handle removed dentries when replaying journal

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge PR 15969 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:33:47 +0000 (22:33 -0700)]
Merge PR 15969 into master

* refs/remotes/upstream/pull/15969/head:
mds/events: Initialize Non-static class members in ESession
mds/events: Initialize Non-static class members in fullbit
mds/events: Initialize Non-static class members in EImportStart
mds/events: Initialize Non-static class members in EFragment

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge PR 16153 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:33:45 +0000 (22:33 -0700)]
Merge PR 16153 into master

* refs/remotes/upstream/pull/16153/head:
mds: fixup may be an unclaimed tick_event

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge PR 16041 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:33:43 +0000 (22:33 -0700)]
Merge PR 16041 into master

* refs/remotes/upstream/pull/16041/head:
mds: “*dir” print repeatedly
MDS: tick_event repeated assignment

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16039 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:33:40 +0000 (22:33 -0700)]
Merge PR 16039 into master

* refs/remotes/upstream/pull/16039/head:
common/config_opts: drop unused opt(mds_kill_journal_at)

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 15982 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:33:38 +0000 (22:33 -0700)]
Merge PR 15982 into master

* refs/remotes/upstream/pull/15982/head:
mds/MDSMap: use find in is_data_pool

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge PR 15981 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:33:36 +0000 (22:33 -0700)]
Merge PR 15981 into master

* refs/remotes/upstream/pull/15981/head:
mds: reinstate daemonperf counters

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge PR 16200 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:33:34 +0000 (22:33 -0700)]
Merge PR 16200 into master

* refs/remotes/upstream/pull/16200/head:
qa: thrash max_mds and deactivate ranks

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 15979 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:33:31 +0000 (22:33 -0700)]
Merge PR 15979 into master

* refs/remotes/upstream/pull/15979/head:
Ignore unmatched rstat errors from MDS during rebuild testing

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge PR 16288 into master
Patrick Donnelly [Tue, 18 Jul 2017 05:31:05 +0000 (22:31 -0700)]
Merge PR 16288 into master

* refs/remotes/upstream/pull/16288/head:
qa/cephfs: don't use int() to convert string of float point number

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #16375 from batrick/docker-core-debug
Kefu Chai [Tue, 18 Jul 2017 05:17:19 +0000 (13:17 +0800)]
Merge pull request #16375 from batrick/docker-core-debug

script: add docker core dump debugger

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoscript: add docker core dump debugger 16375/head
Patrick Donnelly [Mon, 17 Jul 2017 04:27:00 +0000 (21:27 -0700)]
script: add docker core dump debugger

This script sets up a docker container with all the packages used for your Ceph
(test) branch. From there, you can gdb the core dump if you have access to the
test cluster.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #16367 from Yan-waller/wip-walle-0715osdmon
Jos Collin [Tue, 18 Jul 2017 02:11:57 +0000 (02:11 +0000)]
Merge pull request #16367 from Yan-waller/wip-walle-0715osdmon

mon: Fix output text and doc

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agomon: cleanups 16367/head
Yan Jun [Mon, 17 Jul 2017 12:48:34 +0000 (20:48 +0800)]
mon: cleanups

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
8 years agoMerge pull request #16203 from shashalu/raise-s3policy-debug-level
Casey Bodley [Mon, 17 Jul 2017 18:55:24 +0000 (14:55 -0400)]
Merge pull request #16203 from shashalu/raise-s3policy-debug-level

rgw: raise debug level of RGWPostObj_ObjStore_S3::get_policy

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
8 years agoMerge pull request #16373 from jcsp/wip-dashboard-osds
Jason Dillaman [Mon, 17 Jul 2017 18:11:51 +0000 (14:11 -0400)]
Merge pull request #16373 from jcsp/wip-dashboard-osds

mgr/dashboard: add OSD list view

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #15674 from chardan/jfw-wip-20240-printf-format
Kefu Chai [Mon, 17 Jul 2017 17:08:55 +0000 (01:08 +0800)]
Merge pull request #15674 from chardan/jfw-wip-20240-printf-format

libradosstriper: fix format injection vulnerability

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomgr/dashboard: add OSD list view 16373/head
John Spray [Sat, 15 Jul 2017 23:10:37 +0000 (19:10 -0400)]
mgr/dashboard: add OSD list view

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15667 from rzarzynski/wip-rgw-fix-nullptrderef-in-rgw-admin
Yuri Weinstein [Mon, 17 Jul 2017 15:09:43 +0000 (08:09 -0700)]
Merge pull request #15667 from rzarzynski/wip-rgw-fix-nullptrderef-in-rgw-admin

rgw: fix potential null pointer dereference in rgw_admin.

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #16251 from linuxbox2/wip-mgr-nfs-svcmap
Yuri Weinstein [Mon, 17 Jul 2017 15:08:04 +0000 (08:08 -0700)]
Merge pull request #16251 from linuxbox2/wip-mgr-nfs-svcmap

rgw_file:  add service map registration

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16341 from liewegas/wip-20631
Sage Weil [Mon, 17 Jul 2017 15:04:49 +0000 (10:04 -0500)]
Merge pull request #16341 from liewegas/wip-20631

osd: restart boot process if waiting for luminous mons

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15807 from zhangsw/feature-lifecycle-date
Yuri Weinstein [Mon, 17 Jul 2017 14:59:39 +0000 (07:59 -0700)]
Merge pull request #15807 from zhangsw/feature-lifecycle-date

rgw: S3 lifecycle now supports expiration date

Reviewed-by: Daniel Gryniewicz <dang@fprintf.net>
8 years agomon/OSDMonitor: fix "ceph osd pool get rbd all --format=json-pretty" 16283/head
xie xingguo [Thu, 13 Jul 2017 09:06:17 +0000 (17:06 +0800)]
mon/OSDMonitor: fix "ceph osd pool get rbd all --format=json-pretty"

Two problems:
(1) MIN_WRITE_RECENCY_FOR_PROMOTE is a tier-only option.
(2) should automatically filter out unset pool options, otherwise it will
    keep outputing rubbish:

{
    "pool": "rbd",
    "pool_id": 3,
    "min_write_recency_for_promote": 0
}
{
    "pool": "rbd",
    "pool_id": 3,
    "fast_read": 0
}
{
    "pool": "rbd",
    "pool_id": 3
}
{
    "pool": "rbd",
    "pool_id": 3
}
{
    "pool": "rbd",
    "pool_id": 3
}
{
    "pool": "rbd",
    "pool_id": 3,
    "csum_type": "???"
}

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: drop unnecessary write permission for "crush get-tunable" command
xie xingguo [Thu, 13 Jul 2017 08:06:27 +0000 (16:06 +0800)]
mon/OSDMonitor: drop unnecessary write permission for "crush get-tunable" command

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoosd/OSD: filter out deprecated meta for bluestore
xie xingguo [Thu, 13 Jul 2017 07:38:23 +0000 (15:38 +0800)]
osd/OSD: filter out deprecated meta for bluestore

Journal path is filestore related...

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: cleanup last_osd_report if osd does not exist
xie xingguo [Thu, 13 Jul 2017 07:12:21 +0000 (15:12 +0800)]
mon/OSDMonitor: cleanup last_osd_report if osd does not exist

In case we might want to reuse the same slot later.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoosd/OSD: gracefully shutdown on error exit during init
xie xingguo [Thu, 13 Jul 2017 00:21:48 +0000 (08:21 +0800)]
osd/OSD: gracefully shutdown on error exit during init

This can avoid crashes as below:

  0> 2017-07-12 09:34:47.427438 7f320ce61b80 -1 /home/xxg/build/ceph-dev/src/common/HeartbeatMap.cc: In function 'ceph::HeartbeatMap::~HeartbeatMap()'
thread 7f320ce61b80 time 2017-07-12 09:34:47.422986
/home/xxg/build/ceph-dev/src/common/HeartbeatMap.cc: 39: FAILED assert(m_workers.empty())

 ceph version 12.1.0-702-gc5b99af (c5b99af) luminous (rc)
 1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x110) [0x7f320d8ba7f0]
 2: (ceph::HeartbeatMap::~HeartbeatMap()+0xf8) [0x7f320d9be0a8]
 3: (CephContext::~CephContext()+0x40c) [0x7f320d9a648c]
 4: (CephContext::put()+0xe6) [0x7f320d9a6776]
 5: (main()+0xad3) [0x7f320d282953]
 6: (__libc_start_main()+0xf5) [0x7f32094cfb15]
 7: (()+0x4964c9) [0x7f320d31f4c9]
 NOTE: a copy of the executable, or `objdump -rdS <executable>` is needed to interpret this.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoceph: allow '-' with -i and -o for stdin/stdout 16359/head
Sage Weil [Mon, 17 Jul 2017 13:38:52 +0000 (09:38 -0400)]
ceph: allow '-' with -i and -o for stdin/stdout

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: add force-create-pg back 16353/head
Kefu Chai [Sat, 15 Jul 2017 05:12:55 +0000 (13:12 +0800)]
mon: add force-create-pg back

and now it's "ceph osd force-create-pg'

Fixes: http://tracker.ceph.com/issues/20605
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agobuild/ops: rpm: fix typo WTIH_BABELTRACE 16366/head
Nathan Cutler [Mon, 17 Jul 2017 12:46:57 +0000 (14:46 +0200)]
build/ops: rpm: fix typo WTIH_BABELTRACE

Introduced by b331898ea9aefc547265b388dddbc388417184fe

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #16339 from majianpeng/test-fio-print-more-perfcounter
Kefu Chai [Mon, 17 Jul 2017 12:33:21 +0000 (20:33 +0800)]
Merge pull request #16339 from majianpeng/test-fio-print-more-perfcounter

test/fio: print all perfcounters rather than objectstore itself.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore: use reference to void string copy 16364/head
Pan Liu [Mon, 17 Jul 2017 12:26:42 +0000 (20:26 +0800)]
os/bluestore: use reference to void string copy

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
8 years agoMerge pull request #16346 from liewegas/wip-20602
Kefu Chai [Mon, 17 Jul 2017 12:15:24 +0000 (20:15 +0800)]
Merge pull request #16346 from liewegas/wip-20602

mon: skip crush smoke test when running under valgrind

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16302 from liewegas/wip-mds-dup-alerts
Kefu Chai [Mon, 17 Jul 2017 11:46:24 +0000 (19:46 +0800)]
Merge pull request #16302 from liewegas/wip-mds-dup-alerts

mon/MDSMonitor: fix segv when multiple MDSs raise same alert

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agobuild/ops: rpm: socat is only needed for "make check" 15940/head
Nathan Cutler [Mon, 17 Jul 2017 11:13:33 +0000 (13:13 +0200)]
build/ops: rpm: socat is only needed for "make check"

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agobuild/ops: rpm: put mgr python build dependencies in make_check bcond
Nathan Cutler [Tue, 27 Jun 2017 07:45:09 +0000 (09:45 +0200)]
build/ops: rpm: put mgr python build dependencies in make_check bcond

Fixes: http://tracker.ceph.com/issues/20425
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
8 years agoMerge pull request #16189 from bassam/pr-msgr-bind-addr
Sage Weil [Mon, 17 Jul 2017 02:26:23 +0000 (21:26 -0500)]
Merge pull request #16189 from bassam/pr-msgr-bind-addr

mon: add support public_bind_addr option

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16349 from liewegas/wip-vstart-bind
Sage Weil [Mon, 17 Jul 2017 02:24:53 +0000 (21:24 -0500)]
Merge pull request #16349 from liewegas/wip-vstart-bind

vstart.sh: bind restful, dashboard to ::, not 127.0.0.1

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16329 from joscollin/wip-cleanup-crush-warning
Sage Weil [Mon, 17 Jul 2017 02:24:36 +0000 (21:24 -0500)]
Merge pull request #16329 from joscollin/wip-cleanup-crush-warning

crush: silence warning from -Woverflow

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16345 from jcsp/wip-watch-channel
Sage Weil [Mon, 17 Jul 2017 02:16:59 +0000 (21:16 -0500)]
Merge pull request #16345 from jcsp/wip-watch-channel

ceph.in: filter out audit from ceph -w

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16315 from majianpeng/bluestore-misc-fix
Sage Weil [Mon, 17 Jul 2017 02:11:11 +0000 (21:11 -0500)]
Merge pull request #16315 from majianpeng/bluestore-misc-fix

os/bluestore: misc fix and cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16351 from liewegas/wip-mgr-init-debug
Sage Weil [Mon, 17 Jul 2017 02:08:50 +0000 (21:08 -0500)]
Merge pull request #16351 from liewegas/wip-mgr-init-debug

mgr,mon: debug init and mgrdigest subscriptions

8 years agoMerge pull request #16358 from liupan1111/wip-fix-client
Haomai Wang [Mon, 17 Jul 2017 01:49:23 +0000 (09:49 +0800)]
Merge pull request #16358 from liupan1111/wip-fix-client

test/msgr: fixed the hang issue for perf_msg_client

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agotest/msgr: fixed the hang issue for perf_msg_client 16358/head
Pan Liu [Mon, 17 Jul 2017 01:42:04 +0000 (09:42 +0800)]
test/msgr: fixed the hang issue for perf_msg_client

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
8 years agoqa/suites/rados/rest/mgr-restful: simplify 16349/head
Sage Weil [Mon, 17 Jul 2017 01:28:03 +0000 (21:28 -0400)]
qa/suites/rados/rest/mgr-restful: simplify

Use default port; don't bother setting bind addr.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/MgrMonitor: only induce mgr epoch shortly after mkfs 16356/head
Sage Weil [Sun, 16 Jul 2017 18:47:44 +0000 (14:47 -0400)]
mon/MgrMonitor: only induce mgr epoch shortly after mkfs

For early clusters, if there isn't an active manager, we eventually want
to trigger a health warning by rolling over the mgrmap epoch.  We don't
want to do that if we have no active/available manager after that.  Fix
by checking ever_had_active_mgr here.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agorgw: acl grants num limit 16291/head
Enming Zhang [Wed, 12 Jul 2017 14:21:54 +0000 (22:21 +0800)]
rgw: acl grants num limit

According to AWS S3 in this document[1], an ACL can have up to 100
grants.

If the nums of grants is larger than 100, S3 will return like following:
400
<?xml version="1.0" encoding="UTF-8"?>
<Error><Code>MalformedACLError</Code><Message>The XML you provided was not well-formed or did not validate against our published schema</Message><RequestId>10EC67824572C378</RequestId><HostId>AWL3NnQChs/HCfOTu5MtyEc9uzRuxpYMhmvXQry2CovCcuxO2/tMqY1zGoWOur86ipQt3v/WEiA=</HostId></Error>

Now if the nums of request acl grants is larger than the maximum allowed, rgw will return
like following:
400
<?xml version="1.0" encoding="UTF-8"?><Error><Code>MalformedACLError</Code><Message>The request is rejected, because the acl grants number you requested is larger than the maximum 101 grants allowed in an acl.</Message><BucketName>222</BucketName><RequestId>tx000000000000000000017-00596b5fad-101a-default</RequestId><HostId>101a-default-default</HostId></Error>

The maximum number of acl grants can be configured in config file with the configuration item:

rgw_acl_grants_max_num

[1] http://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
8 years agorgw: req xml params size limitation error msg 16310/head
Enming Zhang [Fri, 7 Jul 2017 10:05:17 +0000 (18:05 +0800)]
rgw: req xml params size limitation error msg

Now rgw will return like following:

400
<?xml version="1.0" encoding="UTF-8"?><Error><Code>MalformedXML</Code><Message>The XML you provided was larger than the maximum 2048 bytes allowed.</Message><BucketName>333</BucketName><RequestId>tx000000000000000000009-00596a1331-101a-default</RequestId><HostId>101a-default-default</HostId></Error>

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
8 years agoMerge pull request #15587 from wjwithagen/wip-wjw-ceph-disk-is_diskdevice
Kefu Chai [Sat, 15 Jul 2017 08:31:35 +0000 (16:31 +0800)]
Merge pull request #15587 from wjwithagen/wip-wjw-ceph-disk-is_diskdevice

ceph-disk/ceph_disk/main.py: Replace ST_ISBLK() test by is_diskdevice()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16347 from tchaikov/wip-test-ceph-disk
Kefu Chai [Sat, 15 Jul 2017 08:24:23 +0000 (16:24 +0800)]
Merge pull request #16347 from tchaikov/wip-test-ceph-disk

tests: ceph-disk: use communicate() instead of wait() for output

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agomon/MonCommand: drop unnecessary write permission
xie xingguo [Wed, 12 Jul 2017 09:10:36 +0000 (17:10 +0800)]
mon/MonCommand: drop unnecessary write permission

since "log last" does not ask for it.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoosd/OSDMap: kill dead structure "struct qi"
xie xingguo [Tue, 11 Jul 2017 11:08:48 +0000 (19:08 +0800)]
osd/OSDMap: kill dead structure "struct qi"

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #16334 from wjwithagen/wjw-bug-stringyfy
Jos Collin [Sat, 15 Jul 2017 05:21:23 +0000 (05:21 +0000)]
Merge pull request #16334 from wjwithagen/wjw-bug-stringyfy

core:" Stringify needs access to << before reference" src/include/stringify.h

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agoosd/OSDMap: allow bidirectional swap of pg-upmap-items
xie xingguo [Wed, 12 Jul 2017 03:15:13 +0000 (11:15 +0800)]
osd/OSDMap: allow bidirectional swap of pg-upmap-items

This is useful when we also want an even distribution of pg primaries across osds.
For example:
Was:
[0 1 2]

By applying bidirectional swap of pg-upmap-items mapping [[0,1],[1,0]], now:
[1 0 2]

Thus we successfully decrease the number of primaries of osd.0 by 1 without
affecting the current (even) distribution of global pgs.

Real exmaple:
./bin/ceph pg ls-by-pool rbd
PG_STAT OBJECTS MISSING_ON_PRIMARY DEGRADED MISPLACED UNFOUND BYTES LOG DISK_LOG STATE        STATE_STAMP                VERSION REPORTED UP      UP_PRIMARY ACTING  ACTING_PRIMARY LAST_SCRUB SCRUB_STAMP                LAST_DEEP_SCRUB DEEP_SCRUB_STAMP
3.0           0                  0        0         0       0     0   0        0 active+clean 2017-07-12 15:14:45.083441     0'0    29:13 [0,1,3]          0 [0,1,3]              0        0'0 2017-07-12 15:14:14.515989             0'0 2017-07-12 15:14:14.515989

./bin/ceph osd pg-upmap-items 3.0 0 1 1 0 3 5
set 3.0 pg_upmap_items mapping to [0->1,1->0,3->5]

./bin/ceph pg ls-by-pool rbd
PG_STAT OBJECTS MISSING_ON_PRIMARY DEGRADED MISPLACED UNFOUND BYTES LOG DISK_LOG STATE        STATE_STAMP                VERSION REPORTED UP      UP_PRIMARY ACTING  ACTING_PRIMARY LAST_SCRUB SCRUB_STAMP                LAST_DEEP_SCRUB DEEP_SCRUB_STAMP
3.0           0                  0        0         0       0     0   0        0 active+clean 2017-07-12 15:16:22.648424     0'0    33:13 [1,0,5]          1 [1,0,5]              1        0'0 2017-07-12 15:14:14.515989             0'0 2017-07-12 15:14:14.515989

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/OSDMonitor: another dedup case for pg-upmap-items
xie xingguo [Wed, 12 Jul 2017 02:23:21 +0000 (10:23 +0800)]
mon/OSDMonitor: another dedup case for pg-upmap-items

./bin/ceph osd pg-upmap-items 1.0 1 2 1 2
osd.1 -> osd.2 already exists, set 1.0 pg_upmap_items mapping to [1->2]

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoqa/suites/ceph-disk: whitelist health warnings 16347/head
Kefu Chai [Sat, 15 Jul 2017 02:40:31 +0000 (10:40 +0800)]
qa/suites/ceph-disk: whitelist health warnings

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agotests: ceph-disk: use communicate() instead of wait() for output
Kefu Chai [Fri, 14 Jul 2017 16:07:03 +0000 (00:07 +0800)]
tests: ceph-disk: use communicate() instead of wait() for output

to avoid possible deadlock. quote from doc of Popen.wait()

> This will deadlock when using stdout=PIPE and/or stderr=PIPE and the
child process generates enough output to a pipe such that it blocks
waiting for the OS pipe buffer to accept more data. Use communicate() to
avoid that.

and print out the stdout and stderr using LOG.warn() if the command
fails.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16045 from Liuchang0812/wip-compact-osd-feature
Kefu Chai [Sat, 15 Jul 2017 02:57:13 +0000 (10:57 +0800)]
Merge pull request #16045 from Liuchang0812/wip-compact-osd-feature

osd: compact osd feature

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest/fio: print all perfcounters rather than objectstore itself. 16339/head
Jianpeng Ma [Fri, 14 Jul 2017 22:15:53 +0000 (06:15 +0800)]
test/fio: print all perfcounters rather than objectstore itself.

Need bluefs,rocksdb perfcounters.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoMerge pull request #16221 from liewegas/wip-20546
Sage Weil [Fri, 14 Jul 2017 20:09:22 +0000 (15:09 -0500)]
Merge pull request #16221 from liewegas/wip-20546

crush/CrushWrapper: make get_immediate_parent[_id] ignore per-class shadow hierarchy

Reviewed-by: Neha Ojha <nojha@redhat.com>
8 years agomgr/Mgr: debug init a bit more 16351/head
Sage Weil [Fri, 14 Jul 2017 20:07:28 +0000 (16:07 -0400)]
mgr/Mgr: debug init a bit more

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/MgrMonitor: debug mgrdigest subscriptions a bit
Sage Weil [Fri, 14 Jul 2017 20:06:22 +0000 (16:06 -0400)]
mon/MgrMonitor: debug mgrdigest subscriptions a bit

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agovstart.sh: bind restful, dashboard to ::, not 127.0.0.1
Sage Weil [Fri, 14 Jul 2017 18:34:01 +0000 (14:34 -0400)]
vstart.sh: bind restful, dashboard to ::, not 127.0.0.1

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodocs: add docs for public_bind_addr 16189/head
Bassam Tabbara [Wed, 12 Jul 2017 17:43:39 +0000 (10:43 -0700)]
docs: add docs for public_bind_addr

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agotest,qa/workunits: add tests for public_bind_addr
Bassam Tabbara [Fri, 7 Jul 2017 08:13:35 +0000 (01:13 -0700)]
test,qa/workunits: add tests for public_bind_addr

Add a set of new tests for the case when public_addr and public_bind_addr
are different for a mon. In order to test this properly I had to employ
port forwarding with socat. This helps simulate what would happen in a
environment like Kubernetes. socat is now a build dependency.

Also, moved jq_success to ceph-helpers.sh and refactored run_mon to enable
creating the mons without creating the rbd pool immediately.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agomon: add support public_bind_addr option
Bassam Tabbara [Thu, 13 Jul 2017 21:05:20 +0000 (14:05 -0700)]
mon: add support public_bind_addr option

To support running in dynamic enviornments (like Kubernetes) the mon needs
to be able to advertise and ip address that is different from the ip address
that it listens on locally.

Added a new config option "public_bind_addr" which if set becomes the address
that the mon will bind to locally. If empty (the default) the public_addr
will be used to bind locally.

added a new function on Messenger to set_addr which is called by ceph-mon to set
the advertised address after doing the bind.

also relaxed the "wrong node!" errors in AsyncMessenger and SimpleMessenger as
its now valid to talk to a peer whose peer_addr_of_me is different from what
we expect.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agoMerge pull request #12139 from tianshan/fix_zone_set_realm_id
Yehuda Sadeh [Fri, 14 Jul 2017 16:13:10 +0000 (09:13 -0700)]
Merge pull request #12139 from tianshan/fix_zone_set_realm_id

rgw: fix zone did't update realm_id when added to zonegroup

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #14915 from cbodley/wip-19817
Yuri Weinstein [Fri, 14 Jul 2017 15:52:52 +0000 (08:52 -0700)]
Merge pull request #14915 from cbodley/wip-19817

rgw: add missing RGWPeriod::reflect() based on new atomic update_latest_epoch()

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoqa/suites: disable mon crush smoke test with valgrind 16346/head
Sage Weil [Fri, 14 Jul 2017 15:42:31 +0000 (11:42 -0400)]
qa/suites: disable mon crush smoke test with valgrind

Valgrind runs itself on forked children, and does its cleanup when they
complete, and this is slow... slow enough that it frequently makes the
test time out.

Valgrind let's you ignore child *processes* that you exec, but I can't
find a way to skip forked children in the same address space.

Work around this by skip this validation when running under valgrind.

Fixes: http://tracker.ceph.com/issues/20602
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: add mon_osd_crush_smoke_test=true
Sage Weil [Fri, 14 Jul 2017 15:39:31 +0000 (11:39 -0400)]
mon: add mon_osd_crush_smoke_test=true

This option allows us to disable the crush smoke test when creating pools,
injecting crush maps, or making other changes.  DANGER DANGER.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15953 from rzarzynski/wip-rgw-20418
Yuri Weinstein [Fri, 14 Jul 2017 15:51:42 +0000 (08:51 -0700)]
Merge pull request #15953 from rzarzynski/wip-rgw-20418

rgw: reject request if decoded URI contains \0 in the middle.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoceph.in: filter out audit from ceph -w 16345/head
John Spray [Fri, 14 Jul 2017 15:35:18 +0000 (11:35 -0400)]
ceph.in: filter out audit from ceph -w

...and add an optional --watch-channel argument.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #16340 from dillaman/wip-20630
Sage Weil [Fri, 14 Jul 2017 15:19:25 +0000 (10:19 -0500)]
Merge pull request #16340 from dillaman/wip-20630

qa/tasks: rbd-mirror daemon not properly run in foreground mode

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16331 from zhangsw/cleanup-zonegroup-list
Casey Bodley [Fri, 14 Jul 2017 15:12:57 +0000 (11:12 -0400)]
Merge pull request #16331 from zhangsw/cleanup-zonegroup-list

rgw: remove the useless output when listing zonegroups.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoosd: restart boot process if waiting for luminous mons 16341/head
Sage Weil [Fri, 14 Jul 2017 14:53:14 +0000 (10:53 -0400)]
osd: restart boot process if waiting for luminous mons

If we start_boot and see that we don't have luminous mons, we will stop.
But we don't currently reliably notice when the luminous upgrade completes.
If we happen to be connected to the last mon we will start_boot() because
of the trigger in ms_handle_connect(), but if we are not connected to the
last mon we'll eventually get a monmap update but not restart booting.

Fix by setting a flag if we are waiting, and restart boot if the flag is
set, we are in preboot, and we see we now have luminous mons.

Fixes: http://tracker.ceph.com/issues/20631
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/tasks: rbd-mirror daemon not properly run in foreground mode 16340/head
Jason Dillaman [Fri, 14 Jul 2017 14:32:28 +0000 (10:32 -0400)]
qa/tasks: rbd-mirror daemon not properly run in foreground mode

Fixes: http://tracker.ceph.com/issues/20630
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #16043 from jcsp/wip-dashboard-updates
Sage Weil [Fri, 14 Jul 2017 14:16:33 +0000 (09:16 -0500)]
Merge pull request #16043 from jcsp/wip-dashboard-updates

mgr: dashboard improvements

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomgr/dashboard: update health display 16043/head
John Spray [Thu, 22 Jun 2017 00:34:27 +0000 (20:34 -0400)]
mgr/dashboard: update health display

This takes account of the new health format, also
expands and visually cleans up the frontpage
where we put the health information.

Dark backgrounds make it much easier to use
red/amber/green colours to grab attention.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomgr: expose a MgrMap in PyModules
John Spray [Thu, 22 Jun 2017 00:12:58 +0000 (20:12 -0400)]
mgr: expose a MgrMap in PyModules

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #16020 from jcsp/wip-20383
Sage Weil [Fri, 14 Jul 2017 14:04:16 +0000 (09:04 -0500)]
Merge pull request #16020 from jcsp/wip-20383

mgr: clean up daemon start process

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16338 from scienceluo/wip-doc-branch
Jos Collin [Fri, 14 Jul 2017 13:58:15 +0000 (13:58 +0000)]
Merge pull request #16338 from scienceluo/wip-doc-branch

doc/release-notes: Luminous release notes typo fixes

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agodoc/release-notes: Luminous release notes typo fixes "systemctl ceph-osd.target"... 16338/head
Luo Kexue [Fri, 14 Jul 2017 10:17:07 +0000 (18:17 +0800)]
doc/release-notes: Luminous release notes typo fixes "systemctl ceph-osd.target"->"systemctl restart ceph-osd.target" and "systemctl ceph-mgr.target"->"systemctl restart ceph-mgr.target"

Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
8 years agoMerge pull request #16318 from smithfarm/wip-jewel-10-2-9
Nathan Cutler [Fri, 14 Jul 2017 10:07:18 +0000 (12:07 +0200)]
Merge pull request #16318 from smithfarm/wip-jewel-10-2-9

doc: Jewel v10.2.9 release notes

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoceph_disk/main.py: fixed bugs from theutology report 15587/head
Willem Jan Withagen [Fri, 14 Jul 2017 08:54:32 +0000 (10:54 +0200)]
ceph_disk/main.py: fixed bugs from theutology report

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoceph-disk/main.py: Replace ST_ISBLK() test by is_diskdevice()
Willem Jan Withagen [Thu, 6 Jul 2017 08:40:23 +0000 (10:40 +0200)]
ceph-disk/main.py: Replace ST_ISBLK() test by is_diskdevice()

 - FreeBSD does not have blockdevices any more (since 2002)
   So disk are just Character special devices, so test on ISCHR

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>