Commit Graph

68255 Commits

Author SHA1 Message Date
Guillaume Abrioux
f7230984f6 ceph-detect-init: Add docker detection
if running `ceph-detect-init` from a container, the given output is the
reference from the hosting system. This patch add the capability of
detecting if the tool is being run inside a container.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-02-08 11:31:17 +01:00
Kefu Chai
d25b3550da Merge pull request #12586 from ktdreyer/wip-18313-rgw-upstart
upstart: start radosgw-all according to runlevel

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>
2017-02-08 13:15:43 +08:00
Kefu Chai
df540ba1cb Merge pull request #12086 from wjwithagen/wip-wjw-freebsd-ceph-disk
ceph-disk: FreeBSD changes to get it working and passing tests

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-08 11:37:22 +08:00
Kefu Chai
6be8ec5c88 Merge pull request #13015 from chuanhong-wang/dev_change_osd_df_tree_output
mon: in output of "ceph osd df tree", display "-", not "0",  for pg amount of a bucket

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-08 11:34:07 +08:00
Kefu Chai
8736c2d7d7 Merge pull request #13159 from bassam/pr-fix-embedded-zstd
compressor/zstd: add zstd to embedded ceph

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-08 11:33:53 +08:00
Kefu Chai
ec55b398a9 Merge pull request #13236 from adamemerson/wip-alarum
cleanup: resolve compiler warnings

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-08 11:33:33 +08:00
Kefu Chai
38f3d7433e Merge pull request #13265 from tchaikov/wip-librados-hide-private-symbols
librados: do not expose non-public symbols

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-02-08 11:32:40 +08:00
Kefu Chai
40713870e4 Merge pull request #13268 from tchaikov/wip-better-error-ping-mon
ceph: do not throw TypeError on connection failure

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-02-08 11:32:25 +08:00
Kefu Chai
75434ff70b Merge pull request #13286 from Liuchang0812/remove-useless-close
msg/async: remove useless close function

Reviewed-by: Kefu Chai <kefu@redhat.com>
2017-02-08 11:31:50 +08:00
Kefu Chai
1f9ca87080 Merge pull request #13288 from dmick/master
ceph.in: add help for locally-handled commands

Reviewed-by: Kefu Chai <kefu@redhat.com>
2017-02-08 11:31:02 +08:00
Sage Weil
eafbe4486e Merge pull request #9976 from songbaisen/a13
mon: PGMonitor add check only concern our self cluster command

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-07 17:14:14 -06:00
Sage Weil
402b3580ed Merge pull request #10150 from songbaisen/b
mon: avoid start election twice when quorum enter

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-07 17:13:47 -06:00
Sage Weil
af3d311a82 Merge pull request #10309 from songbaisen/b8
mon: OSDMonitor add check only concern our self cluster command

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-07 17:13:13 -06:00
Yuri Weinstein
9f937aaf9b Merge pull request #12273 from songbaisen/s4
mon: add warn info for osds were removed from osdmap but still kept in crushmap

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-07 13:05:27 -08:00
Yuri Weinstein
1a8e3534b3 Merge pull request #13121 from LiumxNL/wip-170125
osd: we know the definite epoch of marking down

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-07 13:00:21 -08:00
Loic Dachary
3134606163 Merge pull request #13297 from dachary/wip-buildpackages
buildpackages: remove because it does not belong

Reviewed-by: Nathan Cutler <ncutler@suse.cz>
2017-02-07 21:40:58 +01:00
Sage Weil
d62a4948a9 Merge pull request #13162 from liewegas/wip-bluestore-reshard
os/bluestore: partial reshard support

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-02-07 13:01:48 -06:00
Loic Dachary
5a43f8d579 buildpackages: remove because it does not belong
It should live in teuthology, not in Ceph. And it is currently broken:
there is no need to keep it around.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
2017-02-07 18:37:26 +01:00
Matt Benjamin
084ebfcd1b Merge pull request #13035 from yehudasa/wip-18621
rgw: change default chunk size to 4MB
2017-02-07 08:50:49 -05:00
John Spray
9c151d0e5f Merge pull request #13259 from jcsp/wip-jcsp-relnotes
PendingReleaseNotes: note the fuse fstab format change

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-07 12:06:51 +00:00
Dan Mick
ff51087c83 ceph.in: add help for locally-handled commands
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-02-06 20:55:30 -08:00
liuchang0812
e554422ba4 msg/async: remove useless close function
fix coverity cid 1395314: it's invalid to pass a negative value to close function, and we have closed socket in net.connect/nonblock_connect in error cases indeed

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-02-07 11:10:32 +08:00
Zack Cerza
00417f0ecb Merge pull request #13279 from smithfarm/wip-fix-regression
tests: fix regression in qa/tasks/ceph_master.py
2017-02-06 17:08:18 -07:00
Willem Jan Withagen
669bbb9f16 FreeBSD: changes to ceph-disk to get it working and passing tests
- It currently only supports running with filestore
 - Testing is executed while running on a ZFS partition
 - All disktypes and naming is different on FreeBSD
 - Partitioning and tools are not workable on FreeBSD
 - add diagnostic timeout

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-02-07 00:09:42 +01:00
Yehuda Sadeh
7f4818f961 rgw: don't update bucket index multiple times in overwrite
Instead of this for overwrites:
 prepare (index),
   write (head) [-EEXIST]
 cancel (index)
 read (head)
 prepare (index)
   write (head)
 complete (index)

We now do:
 prepare (index),
   write (head) [-EEXIST]
   read (head)
   write (head)
 complete (index)

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-02-06 13:14:21 -08:00
Yehuda Sadeh
6f27f60892 rgw: assume obj write is a first write
if fails and object already exists then retry. This improves first obj
write performance on the expense of overwrites.

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

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-02-06 13:12:06 -08:00
Yehuda Sadeh
66a82b4266 rgw: configurable write obj window size
Fixes: http://tracker.ceph.com/issues/18623

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-02-06 13:08:00 -08:00
Nathan Cutler
db2582e25e tests: fix regression in qa/tasks/ceph_master.py
https://github.com/ceph/ceph/pull/13194 introduced a regression:

2017-02-06T16:14:23.162 INFO:tasks.thrashosds.thrasher:Traceback (most recent call last):
  File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 722, in wrapper
    return func(self)
  File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 839, in do_thrash
    self.choose_action()()
  File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 305, in kill_osd
    output = proc.stderr.getvalue()
AttributeError: 'NoneType' object has no attribute 'getvalue'

This is because the original patch failed to pass "stderr=StringIO()" to run().

Fixes: http://tracker.ceph.com/issues/16263
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-02-06 19:37:38 +01:00
Loic Dachary
fc2df15c01 Merge pull request #12979 from theanalyst/scripts/release-notes-tracker
script: ceph-release-notes check orig. issue only for backports

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-02-06 18:03:55 +01:00
Nathan Cutler
0fba639472 Merge pull request #13277 from jan--f/janf-teuth-cloud-doc
doc: minor change to a cloud testing paragraph

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2017-02-06 18:00:26 +01:00
Sage Weil
088f013961 Merge pull request #13275 from idryomov/wip-require-osd-features-fix
osd/OSDMap: require OSD features only of OSDs

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-06 10:44:39 -06:00
Jan Fajerski
cc97e9d090 doc: minor change to a cloud testing paragraph
Use terminate for the instances to match the terminology used by the
horizon interface.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2017-02-06 16:48:54 +01:00
Sage Weil
d67116bbc6 Merge pull request #13256 from dongbula/correct-cached_crc-comment
osd: correct comment of perfcounter cached_crc in code

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-06 09:15:43 -06:00
Casey Bodley
0f1e08cc4f Merge pull request #13220 from rzarzynski/wip-rgw-18364-2
rgw: be aware abount tenants on cls_user_bucket -> rgw_bucket conversion

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-02-06 09:56:03 -05:00
John Spray
f1c3eeda38 Merge pull request #12993 from jcsp/wip-cephfs-doc-authcaps
doc: clarify the path restriction mds cap example

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-02-06 12:59:22 +00:00
Radoslaw Zarzynski
7511564b88 Merge pull request #13242 from Jing-Scott/dev/fix-swift-anon-getobj-error-code
rgw: swift: fix anonymous user's error code of getting object

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-02-06 13:42:00 +01:00
Ilya Dryomov
ab558bbf29 osd/OSDMap: require OSD features only of OSDs
Fix up commit 1a5cc32f0a ("osd/OSDMap: reflect REQUIRE_*_OSDS flag in
required features") -- require_*_osds shouldn't affect older clients.

Fixes: http://tracker.ceph.com/issues/18831
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-02-06 13:35:51 +01:00
Haomai Wang
17bec5ff02 Merge pull request #13271 from Liuchang0812/fix-file-description-leak
msg/async: fix file description leak in NetHandler

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-02-06 20:16:19 +08:00
liuchang0812
ee1e7c255f msg/async: fix file description leak in NetHandler
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-02-06 19:09:23 +08:00
Jing Wenjun
318de28e10 rgw: swift: fix anonymous user's error code of getting object
The openstack swift will return 401 rather than 403 when
the anon user has no permission to get objects.

Fixes: http://tracker.ceph.com/issues/18806
Signed-off-by: Jing Wenjun <jingwenjun@cmss.chinamobile.com>
2017-02-06 18:50:34 +08:00
Kefu Chai
d832c0ed56 ceph: do not throw TypeError on connection failure
otherwise we could concat None with a string on connection problem.
which will result in TypeError. and the caller will print misleading
error like

Error connecting to cluster: TypeError

see also #12934

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-02-06 16:30:36 +08:00
Sage Weil
5fc3dd36e2 Merge pull request #13237 from smithfarm/wip-18799
tests: Thrasher: eliminate a race between kill_osd and __init__

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-05 12:49:30 -06:00
Kefu Chai
506df1f783 librados: do not expose non-public symbols
librados could be referencing the wrong symbol when calling the
destructor. for example, a variable of type AioGetxattrsData in
IoCtxImpl.cc) could be destructed using the destructor defined in
librados.cc. this is reproduciable using

ceph_test_rados_api_aio --gtest_filter=LibRadosAio.XattrIter

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-02-05 23:33:53 +08:00
Haomai Wang
621e445bbf Merge pull request #13263 from Adirl/fix_log_spaces
msg/async/rdma: fix log line spacing

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-02-05 20:40:58 +08:00
John Spray
1d9668cd0e PendingReleaseNotes: note the fuse fstab format change
Signed-off-by: John Spray <john.spray@redhat.com>
2017-02-04 20:19:44 +00:00
Kefu Chai
6cd8098a61 Merge pull request #13257 from tchaikov/wip-less-verbose-ceph-helper
tests: ceph-helpers.sh reduce get_timeout_delays() verbosity

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-02-04 20:15:34 +08:00
Kefu Chai
389bd00da3 tests: ceph-helpers.sh reduce get_timeout_delays() verbosity
`set +o` prints out the full command line which is echoed if "xtrace" is
enabled. this increases the verbosity of get_timeout_delays().
in this change, we follow the way of kill_daemons() to kill the extra
output. see aefcf6d.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-02-04 17:10:49 +08:00
lvshuhua
64f6ef3913 osd: correct comment of perfcounter cached_crc in code
Signed-off-by: lvshuhua <lvshuhua@cmss.chinamobile.com>
2017-02-04 17:09:20 +08:00
Haomai Wang
3d740bdaa1 Merge pull request #13080 from yuyuyu101/wip-async-fd
msg/async/AsyncConnection: socket's fd can be zero, avoid false assert

Reviewed-by: Kefu Chai <kefu@redhat.com>
2017-02-04 11:37:27 +08:00
Sage Weil
f2f2be0f39 Merge pull request #13251 from scuttlemonkey/master
script: adding contributor credits script

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-03 16:42:36 -06:00