Commit Graph

75651 Commits

Author SHA1 Message Date
Pan Liu
0d28eb3637 aio: move aio.h/cc from fs dir to bluestore dir
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
2017-07-19 11:51:24 +08:00
Jiaying Ren
59e8ddaa5c rgw: miis trivial cleanup
+ drop outdated & misplaced function description
+ drop unused func find_placement

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2017-07-19 11:39:05 +08:00
Kefu Chai
a0d935966c doc: add instructions for replacing an OSD
* 8/ceph.rst: `rm` subcommand removes osd from osdmap, not the cluster.
  the latter is more ambiguous in different contexts.
* rados/operations/add-or-rm-osds.rst: add a subsection of "Replacing an
  OSD". update the subsection of "Removing the OSD" with "ceph osd
  purge" command
* release-notes.rst: link from it to the new subsection in add-or-rm-osds.rst

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-19 11:23:47 +08:00
Jos Collin
07223aa86d Merge pull request #16391 from Yan-waller/wip-walle-0718radososd
osd: combine conditional statements

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-19 02:07:08 +00:00
Sage Weil
dfc32bcb1a ceph_test_rados_api_watch_notify: flush after unwatch
After we unwatch, we need to make sure the finisher thread has flushed
its work before we tear down the test.  Otherwise, the notify callback
may dereference the test object looking for a member and segfault.

Probably-Fixes: http://tracker.ceph.com/issues/20105
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-18 17:42:31 -04:00
Gregory Farnum
1df7833cb3 Merge pull request #16401 from bstillwell/releases-doc-update-20170718
Documentation updates for July 2017 releases

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-07-18 13:54:14 -07:00
Mykola Golub
547aa49d67 Merge pull request #16372 from dillaman/wip-20643
cls/rbd: trash_list should be iterable

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-07-18 23:53:53 +03:00
Gregory Farnum
4293ce5184 Merge pull request #16397 from liewegas/wip-20647
mon/MgrMonitor: fix standby addition to mgrmap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-07-18 13:27:29 -07:00
Bryan Stillwell
230a5a504b Documentation updates for July 2017 releases
Updates for three new releases this month.  Two new Jewel releases
(10.2.8 and 10.2.9) and one new Luminous release candidate (12.1.1).

Signed-off-by: Bryan Stillwell <bstillwell@godaddy.com>
2017-07-18 13:53:02 -06:00
vasukulkarni
327554118c Merge pull request #16350 from ceph/wip-cd-docs-update
[docs/quick-start]: update quick start to add a note for mgr create command for luminous+ builds
2017-07-18 12:31:59 -07:00
Sage Weil
f9a095deb1 crush: s/ruleset/id/ in decompiled output
Moving away from the 'ruleset' terminology.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-18 14:58:19 -04:00
Sage Weil
d0e761b8e3 mon/MgrMonitor: fix standby addition to mgrmap
Inadvertantly removed by ba45fba01c

Fixes: http://tracker.ceph.com/issues/20647
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-18 14:20:48 -04:00
Sage Weil
fd9582f085 Merge pull request #15432 from dachary/wip-osd-new
ceph-disk: support osd new

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-18 13:12:51 -05:00
Sage Weil
adea59839f Merge remote-tracking branch 'gh/luminous' 2017-07-18 13:52:09 -04:00
Casey Bodley
d91f57c0d4 Merge pull request #15837 from fangyuxiangGL/placement-rule-err
rgw: fix err when copy object in bucket with specified placement rule

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-18 13:21:55 -04:00
Sage Weil
7102de8761 qa/suites/upgrade/jewel-x/point-to-point: move set-require-min-compat-client
Do it after workload completes and all jewel clients go away.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-18 12:32:17 -04:00
Sage Weil
e2fdfc0b10 qa/suites/upgrade/jewel-x: link to thrashosds yaml
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-18 12:29:01 -04:00
Joao Eduardo Luis
efa66b48a0 mon/AuthMonitor: generate bootstrap-mgr key on upgrade
We were adding the entity, but no key. By generating a key, we avoid
making things really weird.

Fixes: http://tracker.ceph.com/issues/20666

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
2017-07-18 16:34:23 +01:00
Yuri Weinstein
5f5647afc2 Merge pull request #16291 from ZVampirEM77/wip-acl-grants-num-limit
rgw: acl grants num limit

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-18 07:38:34 -07:00
Yuri Weinstein
280041337c 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>
2017-07-18 07:38:13 -07:00
Yuri Weinstein
bbf8bc8b42 Merge pull request #16324 from yehudasa/wip-20620
rgw: delete object in error path

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-18 07:37:13 -07:00
Sage Weil
5f51a84054 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>
2017-07-18 08:41:00 -05:00
Sage Weil
e9820d6cce Merge pull request #16283 from xiexingguo/wip-osd-segfault
mon, osd: misc fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-18 08:40:34 -05:00
Sage Weil
9fb42cd794 Merge pull request #16353 from tchaikov/wip-20605
mon: add force-create-pg back

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-18 08:39:58 -05:00
Sage Weil
0ff38938c7 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>
2017-07-18 08:39:39 -05:00
Sage Weil
81ae434c7f 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>
2017-07-18 08:39:14 -05:00
Sage Weil
10cfd427cb Merge pull request #16364 from liupan1111/wip-fix-clean
os/bluestore: use reference to avoid string copy

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-18 08:38:59 -05:00
Sage Weil
fce65122fc 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>
2017-07-18 08:38:37 -05:00
Kefu Chai
127dca7c45 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>
2017-07-18 20:27:58 +08:00
Jos Collin
78511bf25c 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>
2017-07-18 08:17:10 +00:00
Jiaying Ren
6728e67065 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
2017-07-18 14:37:23 +08:00
Yan Jun
7b186c3746 osd: combine conditional statement
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2017-07-18 14:24:18 +08:00
Patrick Donnelly
b39a402418
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>
2017-07-17 22:33:51 -07:00
Patrick Donnelly
ba548ffe26
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>
2017-07-17 22:33:49 -07:00
Patrick Donnelly
77189f270a
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>
2017-07-17 22:33:47 -07:00
Patrick Donnelly
64069538d2
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>
2017-07-17 22:33:45 -07:00
Patrick Donnelly
2f6ae4726c
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>
2017-07-17 22:33:43 -07:00
Patrick Donnelly
bc58d6aa92
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>
2017-07-17 22:33:40 -07:00
Patrick Donnelly
ce27e223c6
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>
2017-07-17 22:33:38 -07:00
Patrick Donnelly
39b0bde69a
Merge PR 15981 into master
* refs/remotes/upstream/pull/15981/head:
	mds: reinstate daemonperf counters

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-07-17 22:33:36 -07:00
Patrick Donnelly
5b1a229fca
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>
2017-07-17 22:33:34 -07:00
Patrick Donnelly
39ad17a152
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>
2017-07-17 22:33:31 -07:00
Patrick Donnelly
b94d1dc385
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>
2017-07-17 22:31:05 -07:00
Kefu Chai
6461a94f7e 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>
2017-07-18 13:17:19 +08:00
Patrick Donnelly
8db17d7c74
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>
2017-07-17 19:48:25 -07:00
Jos Collin
a06828106e Merge pull request #16367 from Yan-waller/wip-walle-0715osdmon
mon: Fix output text and doc

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-18 02:11:57 +00:00
Yan Jun
f61516014c mon: cleanups
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2017-07-18 08:20:20 +08:00
Jianpeng Ma
da553f16e5 os/bluestore/BlueStore: Avoid double counting state_kv_queued_lat.
In fact, if txc in kv_submitting queue it also in kv_committing.
For those txc, we should avoid double counting state_kv_queued_lat.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-07-18 06:41:09 +08:00
Sage Weil
dfc9c36606 fix ceph.py 2017-07-17 16:27:13 -04:00
Sage Weil
ccca7a54b6 crush: do not allow creating a rule with ruleset != rule id
Consolidate the add_rule rule id and ruleset arguments to be the same and
fix the callers.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-17 15:56:03 -04:00