RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,730 Commits 216 Branches 394 Tags 1.8 GiB
e27f0474cb
Commit Graph

74730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yan Jun
e27f0474cb tools/rados: clean ups 
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2017-07-04 14:06:59 +08:00
Jos Collin
32297cc062 Merge pull request #16067 from YangFanlinux/affi 
.mailmap, .organizationmap: Update Fan Yang information and affiliation

Reviewed By: Jos Collin <jcollin@redhat.com>
 2017-07-03 10:35:52 +00:00
Kefu Chai
fe2f11390d Merge pull request #16055 from dmick/master 
ceph.in: allow developer mode from outside build tree

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-03 18:01:22 +08:00
Fan Yang
fecd7dc114 mailmap: Fan Yang information and affiliation 
Signed-off-by: Fan Yang <yangf@neunn.com>
 2017-07-03 15:09:03 +08:00
Sage Weil
98e00ab70b Merge pull request #16056 from xiexingguo/wip-kill-log-warn 
common: fix log warnings

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-07-01 10:00:37 -05:00
Sage Weil
90851832a3 Merge pull request #15986 from liewegas/wip-20435 
mon/MgrStatMonitor: avoid dup health warnings during luminous upgrade

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
 2017-07-01 09:11:57 -05:00
Sage Weil
e4fc5cc157 Merge pull request #14178 from songbaisen/m10 
mon: show the leader info on mon stat command

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
 2017-07-01 09:11:31 -05:00
Sage Weil
70a990797f Merge pull request #15585 from dachary/wip-20229-ceph-disk-timeout 
ceph-disk: set the default systemd unit timeout to 3h

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-07-01 09:10:59 -05:00
Sage Weil
715968d379 Merge pull request #15984 from idryomov/wip-chooseargs-encoding-fix 
crush/CrushWrapper: chooseargs encoding fix

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-07-01 09:10:30 -05:00
Sage Weil
41677d2a07 Merge pull request #16023 from liewegas/wip-19994 
systemd/ceph-mgr: remove automagic mgr creation hack

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
 2017-07-01 09:09:52 -05:00
Mykola Golub
866cf72440 Merge pull request #15956 from dillaman/wip-librbd-devstack 
test: fix failing rbd devstack teuthology test

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2017-07-01 15:02:29 +03:00
Mykola Golub
19fbe87791 Merge pull request #15923 from dillaman/wip-qa-rbd-memcheck-python 
qa/suites/rbd: restrict python memcheck validation to CentOS

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2017-07-01 11:24:05 +03:00
xie xingguo
01d7fbe102 common: fix log warnings 
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/LogEntry.cc:54:24: warning: suggest parentheses around comparison in operand of ‘|’ [-Wparentheses]
   } else if (level_str == "warn" | level_str == "warning") {
                        ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/LogEntry.cc:56:24: warning: suggest parentheses around comparison in operand of ‘|’ [-Wparentheses]
   } else if (level_str == "error" | level_str == "err") {

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-01 15:24:22 +08:00
Dan Mick
de15ee1a2b ceph.in: allow developer mode from outside build tree 
Use path of script to look for 'am I in a build tree' rather than
getcwd(), so that 'build tree' versions can be run from anywhere

Fixes: http://tracker.ceph.com/issues/20472
Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2017-06-30 21:36:45 -07:00
Sage Weil
ef2564b9a9 Merge pull request #15911 from xiexingguo/wip-bluestore-20170626 
os/bluestore: narrow cache lock range; make sure min_alloc_size p2 aligned

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
 2017-06-30 21:18:11 -05:00
Sage Weil
c9c697225f Merge pull request #16044 from liewegas/wip-i-cant-believe-its-not-btrfs 
qa: stop testing btrfs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-06-30 21:17:49 -05:00
Sage Weil
aa986f58ef Merge pull request #16046 from liewegas/wip-valgrind-on-centos 
do all valgrind runs on centos

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-06-30 21:17:21 -05:00
Sage Weil
0346998b5a doc: recommend against btrfs 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-30 13:54:18 -04:00
Sage Weil
58f95820e6 Merge pull request #15963 from Songweibin/wip-release-notes 
doc/release-notes: add Images creation timestamp note

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-06-30 09:38:05 -05:00
Sage Weil
d04f5a1d74 Merge pull request #15924 from jcsp/wip-log-last-filters 
mon: Filter `log last` output by severity and channel

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-30 09:11:56 -05:00
Sage Weil
6ee7f82ca0 Merge pull request #15946 from Yan-waller/wip-waller-dumpwatcher0627 
osd: dump the field name of object watchers  and cleanups

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-06-30 09:10:39 -05:00
Sage Weil
1025d7a5aa Merge pull request #15959 from smithfarm/wip-rgw-singleton-cleanup 
tests: rgw/singleton: drop duplicate filestore-xfs.yaml

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-06-30 09:09:53 -05:00
Sage Weil
e82ea13554 Merge pull request #15961 from majianpeng/filestore-remove-redundant-judgement 
os/filestore/FileStore.cc: remove a redundant judgement when get max latency

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Pan Liu <liupan1111@gmail.com>
 2017-06-30 09:09:38 -05:00
Sage Weil
ab42986459 Merge pull request #15999 from Yan-waller/wip-waller-0629message 
msg/MOSDOpReply: fix missing trace decode

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-06-30 09:09:03 -05:00
Jos Collin
eb39bef0d8 Merge pull request #16037 from gmayyyha/monmapmonitor-use-func 
mon/MonmapMonitor: use __func__ instead of hard code function name

Reviewed By: Joao Eduardo Luis <jecluis@gmail.com>
 2017-06-30 13:33:29 +00:00
Sage Weil
c7893283cd do all valgrind runs on centos 
We are fighting two issues with valgrind on ubuntu (xenial, yakkety,
and z):

	http://tracker.ceph.com/issues/18126
	http://tracker.ceph.com/issues/20360

Revert this when it is fixed.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-30 09:33:18 -04:00
Sage Weil
5a2d78ad85 qa: stop testing btrfs 
This is too noisy and we don't recommend it anyway.

See http://tracker.ceph.com/issues/20169

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-30 09:28:03 -04:00
Ilya Dryomov
891798d6e1 PendingReleaseNotes: add a note on choose_args encoding 
It's unlikely that it's been used yet, but worth a note.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
 2017-06-30 14:39:57 +02:00
Ilya Dryomov
dbdf66b8e5 crush/CrushWrapper: crush_choose_arg::ids should be __s32 
crush_choose_arg::ids array is encoded on the wire.  int is not fixed
size -- use __s32 instead (crush_bucket::id is __s32).

This was introduced in commit dbe36e08be ("crush: compile/decompile
crush_choose_arg_map") under SERVER_LUMINOUS bit.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
 2017-06-30 14:37:13 +02:00
Ilya Dryomov
cc90a0ef81 crush/CrushWrapper: encode choose_args.size() as __u32 
choose_args.size() returns size_t, which is not fixed size.  Given that
choose_args code just open-codes our std::map encoder, do what we do for
std::map.

This was introduced in commit dbe36e08be ("crush: compile/decompile
crush_choose_arg_map") under SERVER_LUMINOUS bit.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
 2017-06-30 14:37:13 +02:00
Yanhu Cao
a70232e830 mon/MonmapMonitor: use __func__ instead of hard code function name 
Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
 2017-06-30 16:44:01 +08:00
Sage Weil
d6a13358b5 Merge pull request #15927 from jcsp/wip-mgr-log-on-load-failed 
mgr: cluster log message on plugin load error

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-29 22:04:20 -05:00
Sage Weil
3cd961dfe1 Merge pull request #15951 from wido/issue-20430 
osd: Execute crush_location_hook when configured in ceph.conf

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-06-29 22:03:55 -05:00
Sage Weil
bf87bf0d0d Merge pull request #15954 from Liuchang0812/wip-osd-compact 
mon: fix kvstore type in mon compact command

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-06-29 22:03:37 -05:00
Sage Weil
d68c391bd9 Merge pull request #15957 from liewegas/wip-rc 
ceph_release: we are in the 'rc' phase (12.1.z)

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-29 22:03:20 -05:00
Sage Weil
7fe818990a Merge pull request #15968 from xiexingguo/wip-poolopts-fix 
mon/OSDMonitor: two pool opts related fix

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-06-29 22:03:02 -05:00
Sage Weil
fa8cee8c19 Merge pull request #15974 from liewegas/wip-require-osd-release-print 
osd/OSDMap: print require_osd_release

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-06-29 22:02:47 -05:00
Sage Weil
a8dd57d8a0 Merge pull request #15976 from liewegas/wip-bluestore-big-cache 
os/bluestore: default cache size of 3gb
 2017-06-29 22:02:08 -05:00
Kefu Chai
9b5f7235b4 Merge pull request #15489 from xxhdx1985126/master 
librados: redirect balanced reads to acting primary when targeting object isn't recovered 

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-06-30 10:21:37 +08:00
Kefu Chai
303ec788de Merge pull request #14678 from joscollin/wip-cleanup-storeget-return-check 
mon: handle cases where store->get() may return error

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-30 09:34:59 +08:00
Kefu Chai
da1c73d26a Merge pull request #15926 from liewegas/wip-log-channel 
librados: add log channel to rados_monitor_log2 callback

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-06-30 09:32:56 +08:00
Kefu Chai
7ee4907698 Merge pull request #15925 from jcsp/wip-fsstatus-cleanup 
mgr: clean up fsstatus module

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-30 09:31:02 +08:00
Kefu Chai
afdddc17f8 Merge pull request #15932 from dillaman/wip-20421 
pybind: restore original API for backwards compatibility

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-30 09:29:25 +08:00
Josh Durgin
4bcd6f666b Merge pull request #14760 from dzafman/wip-19657 
osd: On EIO from read recover the primary replica from another copy

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-06-29 14:00:18 -07:00
Yehuda Sadeh
14ab16a46f Merge pull request #15912 from cloudbau/wip-20107 
rgw: Fix duplicate tag removal during GC

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Tested-by: Yuri Weinstein <yweinste@redhat.com>
 2017-06-29 12:54:28 -07:00
Sage Weil
7a3a979f3c systemd/ceph-mgr: remove automagic mgr creation hack 
For kraken we auto-created mgr daemons next to mon daemons with some
systemd hackery.  This is awkward (you can't not get a new mgr daemon when
you deploy a mon), systemd-specific (not implemented for upstart on
trusty), and mostly unexpected.  Since ceph-mgr daemons are now first-class
citizens and required for every cluster, make their deployment explicit
and transparent to the administrator.  Major upgrades are a rare
opportunity to have the administrator's full attention so take advantage
of it.

This effectively reverts 61d779345e and
082199f69d (and follow-on fixes).

Fixes/avoids: http://tracker.ceph.com/issues/19994
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-29 13:39:28 -04:00
Sage Weil
5712698787 Merge pull request #15894 from liewegas/wip-no-default-pool 
mon,osd: do not create rbd pool by default
 2017-06-29 11:21:42 -05:00
John Spray
e5c8703e75 mon: make log command send messages to default channel 
...rather than leaving channel blank.  This means that
people watching the main "cluster" channel will see
the log messages sent using `log`.

Signed-off-by: John Spray <john.spray@redhat.com>
 2017-06-29 11:59:53 -04:00
Yan Jun
ef970f870a message: fix missing decode trace 
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2017-06-29 14:11:26 +08:00
Kefu Chai
7a9ca4e008 Merge pull request #15471 from tchaikov/wip-radostriper-leak-on-fail 
libradosstriper: fix MultiAioCompletion leaks on failure

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-06-29 12:57:36 +08:00