RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-15 23:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,617 Commits 216 Branches 395 Tags 1.2 GiB
ee958a5930
Commit Graph

75617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
songweibin
d29895a45a api/Mirror: make it more understandable when adding peer returns error 
Signed-off-by: songweibin <song.weibin@zte.com.cn>
 2017-07-18 13:27:11 +08: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
Sage Weil
6ffc677dc5 qa/suites/upgade/jewel-x/parallel: ignore FS_ and MDS_ errors during restart 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-17 15:25:38 -04:00
Sage Weil
c66da972df qa/tasks/ceph.py: create osds in order 
We aren't passing id to legacy 'osd create', which means we have to go
in order!

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-17 15:22:47 -04: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
Joao Eduardo Luis
67998dbeae mon/LogMonitor: don't read list's end() for log last 
We will assert semi-randomly if we read the end of the list, which is
not a real element. Instead, walk the list in reverse.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
 2017-07-17 15:41:49 +01: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
Abhishek Lekshmanan
5c8622499c PendingReleaseNotes: add a note on RGW's pool change for resharding 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2017-07-17 15:52:48 +02:00
Abhishek Lekshmanan
365f3215cc rgw: move reshard pool to ns in log pool 
Since the pool was introduced only in Luminous dev and RC releases we
can probably upgrade without the need to bump up the the struct version
numbers. This needs a pending release notes entry

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2017-07-17 15:52:48 +02:00
Abhishek Lekshmanan
a0d8149930 rgw: dump the reshard pool in rgw zone params json 
So that the zone get/put commands display the reshard pool as well

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2017-07-17 15:49:55 +02: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
xie xingguo
a98c7e84ac 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>
 2017-07-17 21:49:41 +08:00
Sage Weil
3a4931b0e4 ceph: allow '-' with -i and -o for stdin/stdout 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-17 09:38:52 -04:00
Ilya Dryomov
0f75d79c34 qa/tasks/rbd_fio: use teuthology.packaging for handling packages 
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
 2017-07-17 15:32:51 +02:00
Kefu Chai
0abee472e3 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>
 2017-07-17 21:18:06 +08:00
Karol Mroz
fad3c4992d rgw: clarify when encountering eacces for reshard list 
Specify that we don't have access to the reshard pool when encountering
EACCESS.
TODO: get rgw's name and add that in the log message

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

Signed-off-by: Karol Mroz <kmroz@suse.de>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2017-07-17 14:48:07 +02:00
Nathan Cutler
758bcf9a0c build/ops: rpm: fix typo WTIH_BABELTRACE 
Introduced by b331898ea9

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2017-07-17 14:46:57 +02:00
Kefu Chai
7aabdc01eb 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>
 2017-07-17 20:33:21 +08:00
Pan Liu
aeac0423cf os/bluestore: use reference to void string copy 
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
 2017-07-17 20:26:42 +08:00
Kefu Chai
c142f25a60 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>
 2017-07-17 20:15:24 +08:00
Kefu Chai
2b3adf71c8 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>
 2017-07-17 19:46:24 +08:00
Nathan Cutler
0e199cef8c build/ops: rpm: socat is only needed for "make check" 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2017-07-17 13:13:33 +02:00
Nathan Cutler
a502a93907 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>
 2017-07-17 13:12:54 +02:00
Josh Durgin
6b3e6302a7 osd/PGLog.h: handle lost+delete entries the same as client deletes 
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
 2017-07-17 02:00:36 -04:00