]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoqa/workunits/rados/test_rados_tool: fix copy paste error 8977/head
Sage Weil [Fri, 6 May 2016 18:54:41 +0000 (14:54 -0400)]
qa/workunits/rados/test_rados_tool: fix copy paste error

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agotests/rbd: add option to leave behind fsx test data
Jason Dillaman [Fri, 6 May 2016 17:42:04 +0000 (13:42 -0400)]
tests/rbd: add option to leave behind fsx test data

tests/rbd: add option to leave behind fsx test data

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests/rbd: add option to leave behind fsx test data 8949/head
Douglas Fuller [Mon, 14 Mar 2016 17:16:35 +0000 (10:16 -0700)]
tests/rbd: add option to leave behind fsx test data

Previously, fsx deleted all test data upon successful completion. Add
an option to leave the data behind for further analysis.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
9 years agoMerge pull request #8936 from bstillwell/manual-install-doc-fixes1
Kefu Chai [Fri, 6 May 2016 16:55:21 +0000 (00:55 +0800)]
Merge pull request #8936 from bstillwell/manual-install-doc-fixes1

doc: install/manual-deployment: use sudo on some commands

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8950 from stiopaa1/osd_passSharedByRef_shouldsharemap
Sage Weil [Fri, 6 May 2016 15:49:36 +0000 (11:49 -0400)]
Merge pull request #8950 from stiopaa1/osd_passSharedByRef_shouldsharemap

osd/OSD: pass shared pointer by const reference

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8962 from beess/doc-fix1
Kefu Chai [Fri, 6 May 2016 14:03:11 +0000 (22:03 +0800)]
Merge pull request #8962 from beess/doc-fix1

doc: Fixes three hyphen errors and a syntax error.

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8934 from liewegas/wip-bluestore-extent-flags
Sage Weil [Fri, 6 May 2016 13:25:11 +0000 (09:25 -0400)]
Merge pull request #8934 from liewegas/wip-bluestore-extent-flags

os/bluestore: drop transient extent flags

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #8607 from ceph/wip-15372
Sage Weil [Fri, 6 May 2016 12:21:14 +0000 (08:21 -0400)]
Merge pull request #8607 from ceph/wip-15372

msg/async: add missing DelayedDelivery and delay injection

9 years agoMerge branch 'sharkcz-optional-tcmalloc'
Boris Ranto [Fri, 6 May 2016 11:46:14 +0000 (13:46 +0200)]
Merge branch 'sharkcz-optional-tcmalloc'

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agofix tcmalloc handling in spec file
Dan Horák [Fri, 6 May 2016 11:29:03 +0000 (13:29 +0200)]
fix tcmalloc handling in spec file

- there is no gperftools/tcmalloc on s390(x) yet
- explicitly disable tcmalloc when built without

Signed-off-by: Dan Horák <dan@danny.cz>
9 years agodoc/rgw: fix hyperlinks which can't work
xie xingguo [Wed, 20 Apr 2016 02:55:51 +0000 (10:55 +0800)]
doc/rgw: fix hyperlinks which can't work

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agodoc/rgw: hyperlink of "Ceph Object Gateway" doesn't work
xie xingguo [Wed, 20 Apr 2016 00:19:05 +0000 (08:19 +0800)]
doc/rgw: hyperlink of "Ceph Object Gateway" doesn't work

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agocmake: Remove redundant call to get_processors
Brad Hubbard [Fri, 6 May 2016 01:09:42 +0000 (11:09 +1000)]
cmake: Remove redundant call to get_processors

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoosd: remove useless set_role from split completion
Sage Weil [Fri, 29 Apr 2016 19:29:19 +0000 (15:29 -0400)]
osd: remove useless set_role from split completion

This is done by PG::split_into().

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: respect shard when setting role on new pgs
Sage Weil [Fri, 29 Apr 2016 19:47:16 +0000 (15:47 -0400)]
osd: respect shard when setting role on new pgs

This matches PG::start_peering_interval().

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: pay attention to shard when setting role
Sage Weil [Fri, 29 Apr 2016 19:44:04 +0000 (15:44 -0400)]
osd: pay attention to shard when setting role

This matches start_peering_interval().

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocreate and check omap fsid
Chendi.Xue [Thu, 18 Feb 2016 02:36:45 +0000 (10:36 +0800)]
create and check omap fsid

1. write osd_uuid to omap dir when doing filestore mkfs
2. check if omap fsid matches osd fsid when doing filestore mount
   (if there is no osd_uuid under omap, assume this as match)

Signed-off-by: Chendi.Xue <chendi.xue@intel.com>
9 years agoAdded option to deploy omap to a separate device(path)
Chendi Xue [Thu, 29 Oct 2015 14:09:40 +0000 (22:09 +0800)]
Added option to deploy omap to a separate device(path)

In the HDD as OSD, SSD as journal test, we saw a great
throughput improvement if moving omap to a SSD device at
randwrite case.

This patch aim to add a config option 'filestore_omap_backend_path'
for users to configurate omap path before deploy.

Signed-off-by: Chendi Xue <chendi.xue@intel.com>
9 years agoObjctStore: More accurate disk space usage calculation when considering 'whiteout...
Igor Fedotov [Mon, 21 Mar 2016 12:51:24 +0000 (15:51 +0300)]
ObjctStore: More accurate disk space usage calculation when considering 'whiteout'/empty/small objects.

This also adds cache protection against potential overflow with removed objects

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agomsg/simple/Pipe: avoid infinite loop in Pipe::do_recv()
Yan, Zheng [Fri, 18 Dec 2015 14:04:08 +0000 (22:04 +0800)]
msg/simple/Pipe: avoid infinite loop in Pipe::do_recv()

I found that, sometimes an OSD thread uses 100% CPU after cutting network
between OSD and client. recv(2) in Pipe::do_recv() keeps returning -EAGAIN,
which causes infinite loop. the call trace is:

 Pipe::do_recv (...)
 Pipe::buffered_recv (...)
 Pipe::tcp_read_nonblocking (...)
 Pipe::tcp_read (...)

Pipe::tcp_read() first calls Pipe::tcp_read_wait() to check if data is
avaliable. If there are prefetched data, Pipe::tcp_read_wait() return
immediately. Pipe::buffered_recv() is called, which reads data from the
prefetched data. If prefetched data isn't enough, Pipe::buffered_recv()
calls Pipe::do_recv() to read data from socket. But it's possble that
socket has no data at this time, so Pipe::do_recv() keeps retry.

The fix is simple, just not retry when recv(2) return -EAGAIN.

Fixes: #14120
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoshow the total pg on each osd.
songbaisen [Fri, 15 Jan 2016 10:01:18 +0000 (18:01 +0800)]
show the  total pg on each osd.
ceph pg dump osds
dumped osds in format plain
osdstat kbused kbavail kb hb in hb out pg sum
143304204 79623420 234882056 [1,2] [] 330
143304204 79623420 234882056 [0,2] [] 295
143304148 79623476 234882056 [0,1] [] 303
sum 429912556 238870316 704646168

Fixes:#14183
Signed-off-by: songbaisen song.baisen@zte.com.cn
9 years agoos/bluestore/KernelDevice: For buffer mode no need do bufferlist::rebuild.
Jianpeng Ma [Sat, 23 Apr 2016 15:21:58 +0000 (23:21 +0800)]
os/bluestore/KernelDevice: For buffer mode no need do bufferlist::rebuild.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoosd: copy blacklist in better way.
songbaisen [Mon, 14 Mar 2016 11:50:09 +0000 (19:50 +0800)]
osd: copy blacklist in better way.

Signed-off-by: song baisen song.baisen@zte.com.cn
9 years agomon/PGMonitor: don't get error code overwritten by 0
xie xingguo [Thu, 28 Apr 2016 04:31:20 +0000 (12:31 +0800)]
mon/PGMonitor: don't get error code overwritten by 0

dump_stuck_pg_stats() method returns either 0 on success or
an negative error code on failure. So it is wrong to reset
"r" to 0.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agomon/PGMonitor: fix inaccurate warn of unscrubbed pgs
xie xingguo [Thu, 28 Apr 2016 06:20:12 +0000 (14:20 +0800)]
mon/PGMonitor: fix inaccurate warn of unscrubbed pgs

1. we automatically perform deep-scrub at osd_deep_scrub_interval,
   not mon_scrub_interval(1week vs. 1day).

2. theoretically a pg can be in a combination state of both unscrubbed
   and un-deep-scrubbed.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agotest/mon/mkfs.sh: clean up kv_backend file
Sage Weil [Tue, 3 May 2016 12:49:35 +0000 (08:49 -0400)]
test/mon/mkfs.sh: clean up kv_backend file

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MonitorDBStore: remember kv backend type
Sage Weil [Mon, 2 May 2016 19:55:50 +0000 (15:55 -0400)]
mon/MonitorDBStore: remember kv backend type

If it is specified, use it; otherwise, go by the config
option.

Record the type when creating the store.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MonitorDBStore: {read,write}_meta
Sage Weil [Mon, 2 May 2016 19:11:43 +0000 (15:11 -0400)]
mon/MonitorDBStore: {read,write}_meta

These are lifted from ObjectStore.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MonitorDBStore: move backend instantiation out of ctor
Sage Weil [Mon, 2 May 2016 19:48:53 +0000 (15:48 -0400)]
mon/MonitorDBStore: move backend instantiation out of ctor

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MonitorDBStore: fix bug in dump output file
Sage Weil [Tue, 3 May 2016 12:50:43 +0000 (08:50 -0400)]
mon/MonitorDBStore: fix bug in dump output file

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: remove bad rocksdb option
Sage Weil [Mon, 2 May 2016 19:29:12 +0000 (15:29 -0400)]
mon: remove bad rocksdb option

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FileStore::sync_entry check for stop in after wait
Kefu Chai [Tue, 3 May 2016 09:20:04 +0000 (17:20 +0800)]
os/FileStore::sync_entry check for stop in after wait

there is chance that the sync_entry() gets signaled in the
WaitInterval(max_interval) call because of sync_cond.Signal() call after
"stop = true" in umount(), so without this change, sync_entry() will
continue wait until min_interval is reached. this forces umount() to
wait even it has called d_force_sync(), and hence slows down the
progress of umount(). so we need to check for `stop` if we are not
signalled because of `force_sync`.

Fixes: http://tracker.ceph.com/issues/15695
Reported-by: Haomai Wang <haomaiwang@gmail.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorpm: Fix SELinux relabel on fedora
Boris Ranto [Wed, 4 May 2016 07:09:47 +0000 (09:09 +0200)]
rpm: Fix SELinux relabel on fedora

The SELinux userspace utilities stopped providing versions when they
switched to CIL language. We need to use a different technique to
relabel the files.

Fixes: #15725
Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agorgw: introduce rgw_list_bucket_min_readahead parameter for bucket listing from rados
Abhishek Varshney [Tue, 26 Apr 2016 08:54:29 +0000 (14:24 +0530)]
rgw: introduce rgw_list_bucket_min_readahead parameter for bucket listing from rados

Signed-off-by: Abhishek Varshney <abhishek.varshney@flipkart.com>
9 years agorgw: fix printing wrong X-Storage-Url in Swift's TempAuth.
Radoslaw Zarzynski [Sun, 24 Apr 2016 15:41:55 +0000 (17:41 +0200)]
rgw: fix printing wrong X-Storage-Url in Swift's TempAuth.

If the option "rgw_swift_account_in_url" is being set to true,
both user and subuser IDs will be present in the X-Storage-Url
header generated by the implementation of Swift API's TempAuth.
This patch rectifies this behavior and makes that only the user
identifier will be placed there.

Fixes: http://tracker.ceph.com/issues/15667
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoTest-enable XIO messenger and IB/RDMA support
Nathan Cutler [Tue, 12 Apr 2016 13:33:45 +0000 (15:33 +0200)]
Test-enable XIO messenger and IB/RDMA support

Fixes: http://tracker.ceph.com/issues/15472
Signed-off-by: Lars Marowsky-Bree <lmb@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorados, test: Restrict usage of --prefix in cleanup
David Zafman [Thu, 7 Apr 2016 19:44:25 +0000 (12:44 -0700)]
rados, test: Restrict usage of --prefix in cleanup

As a precaution to using cleanup for mass deletion of other
objects, only allow --prefix which begins with "benchmark_data."

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agotest: Test rados cleanup command with and without --all
David Zafman [Wed, 6 Apr 2016 20:42:20 +0000 (13:42 -0700)]
test: Test rados cleanup command with and without --all

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agorados: Support --all for rados bench cleanup
David Zafman [Fri, 1 Apr 2016 02:59:21 +0000 (19:59 -0700)]
rados: Support --all for rados bench cleanup

Remove duplicate code in generate_object_name()
Need to handle multiple different pids during cleanup
Add same message from clean_up_slow() in clean_up()

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agocommon: Fix ObjBencher clean_up when no prefix specified
David Zafman [Thu, 31 Mar 2016 03:29:22 +0000 (20:29 -0700)]
common: Fix ObjBencher clean_up when no prefix specified

By default remove all objects named benchmark_data_{hostname} when
there is no benchmark_last_metadata present.

Fixes: http://tracker.ceph.com/issues/15338
Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agotest: Test rados ls with --all option
David Zafman [Wed, 6 Apr 2016 20:41:45 +0000 (13:41 -0700)]
test: Test rados ls with --all option

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agotest: Find ceph command as CEPH_TOOL like rados command
David Zafman [Thu, 7 Apr 2016 23:04:48 +0000 (16:04 -0700)]
test: Find ceph command as CEPH_TOOL like rados command

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agodebian,rpm: add jq build dependency
Sage Weil [Wed, 4 May 2016 20:01:47 +0000 (16:01 -0400)]
debian,rpm: add jq build dependency

Needed since db517ba9176f1ee829453b016b1bd43c6054a555.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agolibrbd: reduce log level for image format 1 warning
Jason Dillaman [Wed, 4 May 2016 17:36:06 +0000 (13:36 -0400)]
librbd: reduce log level for image format 1 warning

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorpm: do a full make check when --with-tests is given
Nathan Cutler [Thu, 28 Apr 2016 17:29:00 +0000 (19:29 +0200)]
rpm: do a full make check when --with-tests is given

The check-local target tests the CLI tools only.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: drop sysvinit bits from relabel_files function
Nathan Cutler [Tue, 26 Apr 2016 15:03:28 +0000 (17:03 +0200)]
rpm: drop sysvinit bits from relabel_files function

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: replace literal paths with RPM macros
Nathan Cutler [Sun, 11 Oct 2015 16:27:45 +0000 (18:27 +0200)]
rpm: replace literal paths with RPM macros

The only place we should write out literal paths is in the RPM scriptlets,
and there only for things that are not installed by this package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: drop udev/95-ceph-osd-alt.rules
Nathan Cutler [Sun, 11 Oct 2015 16:05:12 +0000 (18:05 +0200)]
rpm: drop udev/95-ceph-osd-alt.rules

This udev rules file was needed on older RHEL platforms, which are
unsupported as of jewel.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: global replace $RPM_BUILD_ROOT with %{buildroot}
Nathan Cutler [Sun, 11 Oct 2015 15:20:46 +0000 (17:20 +0200)]
rpm: global replace $RPM_BUILD_ROOT with %{buildroot}

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: put dependencies in alphabetical order
Nathan Cutler [Sun, 11 Oct 2015 08:37:47 +0000 (10:37 +0200)]
rpm: put dependencies in alphabetical order

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: put /sbin/ldconfig into -p
Nathan Cutler [Sun, 11 Oct 2015 12:59:20 +0000 (14:59 +0200)]
rpm: put /sbin/ldconfig into -p

This saves approximately 1 second per invocation.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: drop sysvinit-specific dependencies
Nathan Cutler [Sun, 11 Oct 2015 08:32:46 +0000 (10:32 +0200)]
rpm: drop sysvinit-specific dependencies

Obsolete in jewel and above.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: move boost-random dependency to appropriate section
Nathan Cutler [Sun, 11 Oct 2015 08:32:05 +0000 (10:32 +0200)]
rpm: move boost-random dependency to appropriate section

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: move unified python-sphinx build dependency
Nathan Cutler [Sat, 23 Apr 2016 17:57:49 +0000 (19:57 +0200)]
rpm: move unified python-sphinx build dependency

Now that the python-sphinx build dependency is unified, move it
to the proper section of the spec file.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: drop dead conditionals
Nathan Cutler [Sun, 11 Oct 2015 08:22:37 +0000 (10:22 +0200)]
rpm: drop dead conditionals

This commit drops conditionals that no longer serve any purpose, since
jewel and above do not support the distro versions they are checking for.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: drop python-argparse dependency
Nathan Cutler [Sun, 11 Oct 2015 08:18:33 +0000 (10:18 +0200)]
rpm: drop python-argparse dependency

This was only necessary for older (now unsupported) distro versions.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: drop _with_systemd
Nathan Cutler [Sun, 11 Oct 2015 08:02:40 +0000 (10:02 +0200)]
rpm: drop _with_systemd

Ceph versions jewel and above only support systemd.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: drop init-ceph.in-fedora.patch
Nathan Cutler [Sat, 23 Apr 2016 17:41:06 +0000 (19:41 +0200)]
rpm: drop init-ceph.in-fedora.patch

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: drop python_sitelib/sitearch conditional
Nathan Cutler [Sun, 11 Oct 2015 07:43:06 +0000 (09:43 +0200)]
rpm: drop python_sitelib/sitearch conditional

This conditional was required to support older versions of RHEL/CentOS that are
no longer supported in infernalis and above.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agofix tcmalloc handling in spec file 8966/head
Dan Horák [Fri, 6 May 2016 11:29:03 +0000 (13:29 +0200)]
fix tcmalloc handling in spec file

- there is no gperftools/tcmalloc on s390(x) yet
- explicitly disable tcmalloc when built without

9 years agoMerge pull request #8660 from xiexingguo/xxg-wip-docmultisite
Kefu Chai [Fri, 6 May 2016 11:08:27 +0000 (19:08 +0800)]
Merge pull request #8660 from xiexingguo/xxg-wip-docmultisite

doc/rgw: hyperlink of "Ceph Object Gateway" doesn't work

Reviewed-by: luo kexue <luo.kexue@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: Fixes three hyphen errors and a syntax error. 8962/head
zhuangxc89 [Fri, 6 May 2016 09:20:40 +0000 (17:20 +0800)]
doc: Fixes three hyphen errors and a syntax error.

Signed-off-by: Zhuang Xiaochun <zhuangxc89@163.com>
9 years agoMerge pull request #8954 from badone/wip-cmake-jj-fix
Kefu Chai [Fri, 6 May 2016 07:38:25 +0000 (15:38 +0800)]
Merge pull request #8954 from badone/wip-cmake-jj-fix

cmake: Remove redundant call to get_processors

9 years agocmake: Remove redundant call to get_processors 8954/head
Brad Hubbard [Fri, 6 May 2016 01:09:42 +0000 (11:09 +1000)]
cmake: Remove redundant call to get_processors

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agodoc/rgw: fix hyperlinks which can't work 8660/head
xie xingguo [Wed, 20 Apr 2016 02:55:51 +0000 (10:55 +0800)]
doc/rgw: fix hyperlinks which can't work

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agodoc: Some commands also need sudo to run 8936/head
Bryan Stillwell [Wed, 4 May 2016 20:27:24 +0000 (14:27 -0600)]
doc: Some commands also need sudo to run

Included sudo on some commands which need it to run properly and also
fixed a few grammar problems.

Signed-off-by: Bryan Stillwell <bryan.stillwell@twcable.com>
9 years agoMerge pull request #8834 from liewegas/wip-pg-role 8939/head
Sage Weil [Thu, 5 May 2016 16:40:00 +0000 (12:40 -0400)]
Merge pull request #8834 from liewegas/wip-pg-role

osd: set pg role more carefully

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6421 from xuechendi/wip-omap-out
Sage Weil [Thu, 5 May 2016 16:39:21 +0000 (12:39 -0400)]
Merge pull request #6421 from xuechendi/wip-omap-out

os/filestore: add option to deploy omap to a separate device(path)

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6664 from ifed01/wip-13848
Sage Weil [Thu, 5 May 2016 16:38:43 +0000 (12:38 -0400)]
Merge pull request #6664 from ifed01/wip-13848

osd: more accurate disk space usage calculation when considering 'whiteout'/empty/small objects.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6971 from ukernel/jewel-14120
Sage Weil [Thu, 5 May 2016 16:37:44 +0000 (12:37 -0400)]
Merge pull request #6971 from ukernel/jewel-14120

msg/simple/Pipe: avoid infinite loop in Pipe::do_recv()

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7050 from songbaisen/wipshowpg
Sage Weil [Thu, 5 May 2016 16:36:59 +0000 (12:36 -0400)]
Merge pull request #7050 from songbaisen/wipshowpg

mon: show the pg count in df output

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7872 from majianpeng/bluestore-write-buffer-rebuild
Sage Weil [Thu, 5 May 2016 16:36:16 +0000 (12:36 -0400)]
Merge pull request #7872 from majianpeng/bluestore-write-buffer-rebuild

os/bluestore/KernelDevice: For buffer mode no need do bufferlist::rebuid

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #8087 from songbaisen/song13
Sage Weil [Thu, 5 May 2016 16:35:39 +0000 (12:35 -0400)]
Merge pull request #8087 from songbaisen/song13

osd: copy blacklist in better way.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8800 from xiexingguo/xxg-wip-fixscrubwarn
Sage Weil [Thu, 5 May 2016 16:35:10 +0000 (12:35 -0400)]
Merge pull request #8800 from xiexingguo/xxg-wip-fixscrubwarn

mon/PGMonitor: fix inaccurate warn of unscrubbed pgs

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8888 from liewegas/wip-mon-kv
Sage Weil [Thu, 5 May 2016 16:34:24 +0000 (12:34 -0400)]
Merge pull request #8888 from liewegas/wip-mon-kv

mon: enable different backends (e.g., rocksdb)

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #8905 from tchaikov/wip-15695
Sage Weil [Thu, 5 May 2016 16:33:14 +0000 (12:33 -0400)]
Merge pull request #8905 from tchaikov/wip-15695

os/FileStore::sync_entry check for stop in after wait

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8923 from ceph/wip-selinux-relabel
Boris Ranto [Thu, 5 May 2016 12:54:32 +0000 (14:54 +0200)]
Merge pull request #8923 from ceph/wip-selinux-relabel

rpm: Fix SELinux relabel on fedora

Reviewed-by: Petr Lautrbach <plautrba@redhat.com>
9 years agoMerge pull request #8756 from Abhishekvrshny/fix-rgw-min-read-ahead
Orit Wasserman [Thu, 5 May 2016 11:03:12 +0000 (13:03 +0200)]
Merge pull request #8756 from Abhishekvrshny/fix-rgw-min-read-ahead

rgw: introduce rgw_list_bucket_min_readahead parameter for bucket list
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8726 from rzarzynski/wip-rgw-xstorageurl-fix
Orit Wasserman [Thu, 5 May 2016 08:17:39 +0000 (10:17 +0200)]
Merge pull request #8726 from rzarzynski/wip-rgw-xstorageurl-fix

rgw: fix printing wrong X-Storage-Url in Swift's TempAuth.

Fixes: http://tracker.ceph.com/issues/15667
Reviewed-by: Orit Wasserman <owassern@redhat.com>
9 years agoMerge pull request #8557 from SUSE/wip-15472
Nathan Cutler [Thu, 5 May 2016 07:38:30 +0000 (09:38 +0200)]
Merge pull request #8557 from SUSE/wip-15472

Test-enable XIO messenger and IB/RDMA support

Reviewed-by: Roi Dayan <roi.dayan@gmail.com>
Reviewed-by: Sage Weil <sweil@redhat.com>
9 years agoTest-enable XIO messenger and IB/RDMA support 8557/head
Nathan Cutler [Tue, 12 Apr 2016 13:33:45 +0000 (15:33 +0200)]
Test-enable XIO messenger and IB/RDMA support

Fixes: http://tracker.ceph.com/issues/15472
Signed-off-by: Lars Marowsky-Bree <lmb@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #8405 from dzafman/wip-15338
David Zafman [Thu, 5 May 2016 01:22:33 +0000 (18:22 -0700)]
Merge pull request #8405 from dzafman/wip-15338

common: Fix ObjBencher clean_up when no prefix specified

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8935 from ceph/wip-jq
David Zafman [Thu, 5 May 2016 01:10:20 +0000 (18:10 -0700)]
Merge pull request #8935 from ceph/wip-jq

debian,rpm: add jq build dependency

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoosd/OSD: pass shared pointer by const reference 8950/head
Michal Jarzabek [Wed, 4 May 2016 21:19:32 +0000 (22:19 +0100)]
osd/OSD: pass shared pointer by const reference

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #8932 from dillaman/wip-15577
Josh Durgin [Wed, 4 May 2016 20:46:07 +0000 (13:46 -0700)]
Merge pull request #8932 from dillaman/wip-15577

librbd: reduce log level for image format 1 warning

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agorpm: Fix SELinux relabel on fedora 8923/head
Boris Ranto [Wed, 4 May 2016 07:09:47 +0000 (09:09 +0200)]
rpm: Fix SELinux relabel on fedora

The SELinux userspace utilities stopped providing versions when they
switched to CIL language. We need to use a different technique to
relabel the files.

Fixes: #15725
Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agodebian,rpm: add jq build dependency 8935/head
Sage Weil [Wed, 4 May 2016 20:01:47 +0000 (16:01 -0400)]
debian,rpm: add jq build dependency

Needed since db517ba9176f1ee829453b016b1bd43c6054a555.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8720 from ceph/wip-13445
Nathan Cutler [Wed, 4 May 2016 19:31:04 +0000 (21:31 +0200)]
Merge pull request #8720 from ceph/wip-13445

rpm: drop support for unsupported distros

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoos/bluestore: drop useless wal check 8934/head
Sage Weil [Wed, 4 May 2016 19:22:13 +0000 (15:22 -0400)]
os/bluestore: drop useless wal check

Length is already trimmed to the current extent at the top of the
loop.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: drop COW_TAIL extent flag
Sage Weil [Wed, 4 May 2016 18:11:52 +0000 (14:11 -0400)]
os/bluestore: drop COW_TAIL extent flag

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: drop COW_HEAD extent flag
Sage Weil [Wed, 4 May 2016 18:04:40 +0000 (14:04 -0400)]
os/bluestore: drop COW_HEAD extent flag

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: drop UNWRITTEN extent flag
Sage Weil [Wed, 4 May 2016 17:56:52 +0000 (13:56 -0400)]
os/bluestore: drop UNWRITTEN extent flag

This was a transient flag that only existed in memory, and
muddles the ondisk state vs write logic separation.  Replace it
with a simple range that got allocated.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: drop dead overlay code
Sage Weil [Wed, 4 May 2016 17:41:41 +0000 (13:41 -0400)]
os/bluestore: drop dead overlay code

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: drop unwritten handling in _do_read
Sage Weil [Wed, 4 May 2016 17:40:57 +0000 (13:40 -0400)]
os/bluestore: drop unwritten handling in _do_read

These never reach disk.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agolibrbd: reduce log level for image format 1 warning 8932/head
Jason Dillaman [Wed, 4 May 2016 17:36:06 +0000 (13:36 -0400)]
librbd: reduce log level for image format 1 warning

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorgw: fix printing wrong X-Storage-Url in Swift's TempAuth. 8726/head
Radoslaw Zarzynski [Sun, 24 Apr 2016 15:41:55 +0000 (17:41 +0200)]
rgw: fix printing wrong X-Storage-Url in Swift's TempAuth.

If the option "rgw_swift_account_in_url" is being set to true,
both user and subuser IDs will be present in the X-Storage-Url
header generated by the implementation of Swift API's TempAuth.
This patch rectifies this behavior and makes that only the user
identifier will be placed there.

Fixes: http://tracker.ceph.com/issues/15667
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoFixes for list-inconsistent-*
David Zafman [Wed, 4 May 2016 17:07:50 +0000 (10:07 -0700)]
Fixes for list-inconsistent-*

Improve rados scrub output
Add epoch for future repair-read feature
Add testing of rados scrub output

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>
9 years agotest: Add testing of new scrub commands in rados 7289/head
David Zafman [Tue, 3 May 2016 19:10:38 +0000 (12:10 -0700)]
test: Add testing of new scrub commands in rados

Test list-inconsistent-pg
Test list-inconsistent-obj
Test inconsistent-snapset

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #8916 from linuxbox2/xio-cmake
Kefu Chai [Wed, 4 May 2016 16:50:47 +0000 (00:50 +0800)]
Merge pull request #8916 from linuxbox2/xio-cmake

cmake: <UPPERCASED_NAME>_FOUND in Findxio.cmake

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8768 from cbodley/wip-rgw-admin-zonegroup
Orit Wasserman [Wed, 4 May 2016 14:46:02 +0000 (16:46 +0200)]
Merge pull request #8768 from cbodley/wip-rgw-admin-zonegroup

radosgw-admin: add missing --zonegroup-id to usage