RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-28 05:22:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,458 Commits 218 Branches 395 Tags 1.6 GiB
547aa49d67
Commit Graph

75458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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 3af3f4e84c

Signed-off-by: Jiaying Ren jiaying.ren@umcloud.com
 2017-07-18 14:37:23 +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
Casey Bodley
bdb41410f3 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>
 2017-07-17 14:55:24 -04:00
Jason Dillaman
959a7b5ce6 Merge pull request #16373 from jcsp/wip-dashboard-osds 
mgr/dashboard: add OSD list view

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-07-17 14:11:51 -04:00
Vasu Kulkarni
d25ebbdab1 update ceph-deploy quick start to add a note for mgr create command 
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
 2017-07-17 10:22:43 -07:00
Kefu Chai
2d4aabf2f2 Merge pull request #15674 from chardan/jfw-wip-20240-printf-format 
libradosstriper: fix format injection vulnerability

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-18 01:08:55 +08:00
Jenkins Build Slave User
f3e663a190 12.1.1 2017-07-17 16:56:02 +00:00
John Spray
018b386f0c mgr/dashboard: add OSD list view 
Signed-off-by: John Spray <john.spray@redhat.com>
 2017-07-17 12:44:57 -04:00
Yuri Weinstein
a6adc6cf3d 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>
 2017-07-17 08:09:43 -07:00
Yuri Weinstein
d02b00c792 Merge pull request #16251 from linuxbox2/wip-mgr-nfs-svcmap 
rgw_file:  add service map registration

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-07-17 08:08:04 -07:00
Sage Weil
b8737fa07e Merge pull request #16341 from liewegas/wip-20631 
osd: restart boot process if waiting for luminous mons

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-07-17 10:04:49 -05:00
Yuri Weinstein
eb26360b45 Merge pull request #15807 from zhangsw/feature-lifecycle-date 
rgw: S3 lifecycle now supports expiration date

Reviewed-by: Daniel Gryniewicz <dang@fprintf.net>
 2017-07-17 07:59:39 -07:00
Jason Dillaman
b6c6f7437c cls/rbd: trash_list should be iterable 
Fixes: http://tracker.ceph.com/issues/20643
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-07-17 10:23:47 -04:00
xie xingguo
963c1cd3af 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>
 2017-07-17 21:49:45 +08:00
xie xingguo
21b5640549 mon/OSDMonitor: drop unnecessary write permission for "crush get-tunable" command 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-17 21:49:44 +08:00
xie xingguo
a7917e59ab osd/OSD: filter out deprecated meta for bluestore 
Journal path is filestore related...

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-17 21:49:42 +08:00
xie xingguo
b9526c5455 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>
 2017-07-17 21:49:42 +08:00