]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agotest/rgw: enable mtime comparison in check_object_eq() 9013/head
Casey Bodley [Wed, 27 Apr 2016 21:17:57 +0000 (17:17 -0400)]
test/rgw: enable mtime comparison in check_object_eq()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #8166 from kmroz/wip-rgw-rest-conn-use-vector
Casey Bodley [Mon, 9 May 2016 18:11:05 +0000 (14:11 -0400)]
Merge pull request #8166 from kmroz/wip-rgw-rest-conn-use-vector

rgw: rest and http client code to use param vectors

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agocommon/ShardedOpWQ: make timeout when calling WaitInterval configurabletest run http...
Yuri Weinstein [Mon, 9 May 2016 16:10:01 +0000 (09:10 -0700)]
common/ShardedOpWQ: make timeout when calling WaitInterval configurabletest run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

common/ShardedOpWQ: make timeout when calling WaitInterval configurable

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

9 years agoMerge pull request #8810 from xiexingguo/xxg-wip-fixgotfullmap
Yuri Weinstein [Mon, 9 May 2016 16:09:26 +0000 (09:09 -0700)]
Merge pull request #8810 from xiexingguo/xxg-wip-fixgotfullmap

osd: fix problematic got_full_map() logic

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

9 years agoMerge pull request #8857 from liewegas/wip-15678
Yuri Weinstein [Mon, 9 May 2016 16:09:13 +0000 (09:09 -0700)]
Merge pull request #8857 from liewegas/wip-15678

osd: handle boot racing with NOUP set

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

9 years agoMerge pull request #8881 from liewegas/wip-14952
Yuri Weinstein [Mon, 9 May 2016 16:08:39 +0000 (09:08 -0700)]
Merge pull request #8881 from liewegas/wip-14952

osd: fix pg stuck messages while PGs are being created

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

9 years agoMerge pull request #8798 from majianpeng/buffer
Yuri Weinstein [Mon, 9 May 2016 16:07:19 +0000 (09:07 -0700)]
Merge pull request #8798 from majianpeng/buffer

common/buffer: clean up alignment checks

test run http://pulpito.ceph.com/yuriw-2016-05-08_08:12:51-rados-wip-yuri-testing2---basic-smithi/

9 years agoMerge pull request #8953 from xiexingguo/xxg-wip-prettydump
Yuri Weinstein [Mon, 9 May 2016 16:06:31 +0000 (09:06 -0700)]
Merge pull request #8953 from xiexingguo/xxg-wip-prettydump

mon/PGMap: pretty output for "pg dump osds" command

9 years agoMerge pull request #8986 from stiopaa1/osd_prepublishmap_move
Sage Weil [Mon, 9 May 2016 15:53:05 +0000 (11:53 -0400)]
Merge pull request #8986 from stiopaa1/osd_prepublishmap_move

osd/OSD.h: move shared_ptr instead of copying it

Reviewed-by: Adam Emerson <aemerson@redhat.com
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8981 from ceph/wip-rgw-test-fix
Casey Bodley [Mon, 9 May 2016 15:25:32 +0000 (11:25 -0400)]
Merge pull request #8981 from ceph/wip-rgw-test-fix

test/rgw: fix bucket checkpoint

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #8786 from tchaikov/wip-btrfs-sudo
Kefu Chai [Mon, 9 May 2016 14:38:07 +0000 (22:38 +0800)]
Merge pull request #8786 from tchaikov/wip-btrfs-sudo

test: sudo to rm btrfs subvol

Reviewed-by: Erwan Velu <erwan@redhat.com>
9 years agoMerge pull request #8994 from theanalyst/fix/15776
Orit Wasserman [Mon, 9 May 2016 14:36:43 +0000 (16:36 +0200)]
Merge pull request #8994 from theanalyst/fix/15776

 rgw: log name instead of id for SystemMetaObj on failure

9 years agoMerge pull request #8919 from stiopaa1/log_moveToPrivateOsdService
Sage Weil [Mon, 9 May 2016 13:51:19 +0000 (09:51 -0400)]
Merge pull request #8919 from stiopaa1/log_moveToPrivateOsdService

osd/OSD.h: change some data members to private

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8989 from flyd1005/wip-fix-python-warnings
Sage Weil [Mon, 9 May 2016 13:50:46 +0000 (09:50 -0400)]
Merge pull request #8989 from flyd1005/wip-fix-python-warnings

cleanup: python: remove warnings of 'trailing whitespace' and 'new blank line at EOF'

9 years agoMerge pull request #8992 from runsisi/wip-fix-dup-keygen
Sage Weil [Mon, 9 May 2016 13:49:54 +0000 (09:49 -0400)]
Merge pull request #8992 from runsisi/wip-fix-dup-keygen

cls_journal: remove duplicated key generation

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8991 from emenguy/doc_test-reweight-by-utilization
Sage Weil [Mon, 9 May 2016 13:48:52 +0000 (09:48 -0400)]
Merge pull request #8991 from emenguy/doc_test-reweight-by-utilization

doc: adding test-reweight-by-utilization documentation

9 years agoMerge pull request #8984 from stiopaa1/osd_removeUnorderedSet
Sage Weil [Mon, 9 May 2016 13:38:12 +0000 (09:38 -0400)]
Merge pull request #8984 from stiopaa1/osd_removeUnorderedSet

osd/OSD.h: remove unneeded include file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8097 from aclamk/crushtool-pool-id
Sage Weil [Mon, 9 May 2016 13:15:24 +0000 (09:15 -0400)]
Merge pull request #8097 from aclamk/crushtool-pool-id

crushtool: add ability of precise testing of placement group calculation.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8832 from stiopaa1/log_graylogmove
Sage Weil [Mon, 9 May 2016 13:14:55 +0000 (09:14 -0400)]
Merge pull request #8832 from stiopaa1/log_graylogmove

common/Graylog.cc: use std move to avoid copy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8920 from XinzeChi/wip-race-shutdown
Sage Weil [Mon, 9 May 2016 13:14:10 +0000 (09:14 -0400)]
Merge pull request #8920 from XinzeChi/wip-race-shutdown

osd: fix deadlock in OSD::_committed_osd_maps

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8922 from runsisi/wip-fix-lockdep-assert
Sage Weil [Mon, 9 May 2016 13:13:26 +0000 (09:13 -0400)]
Merge pull request #8922 from runsisi/wip-fix-lockdep-assert

lockdep: fix assertion expression if ran out of lock ids

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #8967 from liewegas/wip-15760
Sage Weil [Mon, 9 May 2016 13:12:49 +0000 (09:12 -0400)]
Merge pull request #8967 from liewegas/wip-15760

osdc/Objecter: upper bound watch_check result

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8357 from liewegas/wip-osd-prestart
Sage Weil [Mon, 9 May 2016 12:59:05 +0000 (08:59 -0400)]
Merge pull request #8357 from liewegas/wip-osd-prestart

osd: update crush_location from ceph-osd on startup

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8194 from tanghaodong25/fix_4
Sage Weil [Mon, 9 May 2016 12:58:33 +0000 (08:58 -0400)]
Merge pull request #8194 from tanghaodong25/fix_4

os/bluestore/KernelDevice.cc: small fix in buffer flush

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #8349 from Aran85/prepare_entry_cleanup
Sage Weil [Mon, 9 May 2016 12:57:51 +0000 (08:57 -0400)]
Merge pull request #8349 from Aran85/prepare_entry_cleanup

os/filestore: prepare entry cleanup

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoosd: create osd id if it does not exist 8357/head
Sage Weil [Thu, 28 Apr 2016 14:09:29 +0000 (10:09 -0400)]
osd: create osd id if it does not exist

Most tools create the osd id before trying to start ceph-osd.  Notably,
teuthology does not.  We could fix that, but we would be changing behavior,
as the osd boot will happily create the osd id on the fly for us.  Other
provisioning tools might rely on that behavior.  Instead, just allocate
the id sooner in the process (if necessary).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: change osd_crush_initial_weight = 0 to mean weight to 0
Sage Weil [Fri, 22 Apr 2016 15:12:38 +0000 (11:12 -0400)]
osd: change osd_crush_initial_weight = 0 to mean weight to 0

Negative now means auto-weight, 0 means weight to 0.  Change the
default accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: update crush_location on startup from ceph-osd
Sage Weil [Fri, 22 Apr 2016 15:07:05 +0000 (11:07 -0400)]
osd: update crush_location on startup from ceph-osd

Update the crush location from ceph-osd instead of relying on
kludgey bash in ceph-osd-prestart.sh.  Among other things, this
lets us get accurate statfs information from the ObjectStore
implementation instead of relying on 'df'.

Fixes: http://tracker.ceph.com/issues/15213
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosdc/Objecter: use cct's crush_location
Sage Weil [Tue, 29 Mar 2016 16:50:22 +0000 (12:50 -0400)]
osdc/Objecter: use cct's crush_location

Keep the observer so that we refresh our copy of the multimap.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoglobal: init crush_location on daemon start
Sage Weil [Tue, 29 Mar 2016 16:50:03 +0000 (12:50 -0400)]
global: init crush_location on daemon start

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocommon/ceph_context: add CrushLocation to cct
Sage Weil [Tue, 29 Mar 2016 16:49:36 +0000 (12:49 -0400)]
common/ceph_context: add CrushLocation to cct

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocrush/CrushLocation: add class to manage crush_location
Sage Weil [Tue, 29 Mar 2016 16:49:16 +0000 (12:49 -0400)]
crush/CrushLocation: add class to manage crush_location

The crush_location can come from an explicitly set config,
a hook, or a simple fabricated default (root=default host=...).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8684 from vuhuong/wip-radosaio-copyout-data-xio
Sage Weil [Mon, 9 May 2016 12:52:56 +0000 (08:52 -0400)]
Merge pull request #8684 from vuhuong/wip-radosaio-copyout-data-xio

librados: copy out data to users' buffer for xio

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
9 years agoMerge pull request #8759 from xiexingguo/xxg-wip-fixobjecterrace
Sage Weil [Mon, 9 May 2016 12:51:30 +0000 (08:51 -0400)]
Merge pull request #8759 from xiexingguo/xxg-wip-fixobjecterrace

osdc/Objecter: fix race condition for sortbitwise flag detection

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8826 from liewegas/wip-bluestore-bitmap-freelist
Sage Weil [Mon, 9 May 2016 12:50:23 +0000 (08:50 -0400)]
Merge pull request #8826 from liewegas/wip-bluestore-bitmap-freelist

os/bluestore: bitmap-based freelist using merge operator

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agorgw: drop unnecessary spacing in rgw zg init log 8994/head
Abhishek Lekshmanan [Mon, 9 May 2016 12:05:06 +0000 (14:05 +0200)]
rgw: drop unnecessary spacing in rgw zg init log

Dropping unneeded space when we're printing the failed reading zg info
message

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agorgw: log name instead of id for SystemMetaObj on failure
Abhishek Lekshmanan [Mon, 9 May 2016 09:41:19 +0000 (11:41 +0200)]
rgw: log name instead of id for SystemMetaObj on failure

Currently if we fail to read a SystemMetaObj we try to log the
MetaObject id, however this will not be set mostly as read_id has
failed, so we end up logging an empty id, changing this to log
the object name instead

Fixes: http://tracker.ceph.com/issues/15776
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoadding test-reweight-by-utilization documentation 8991/head
Etienne Menguy [Mon, 9 May 2016 08:49:47 +0000 (10:49 +0200)]
adding test-reweight-by-utilization documentation

Signed-off-by: Etienne Menguy <etienne.menguy@corp.ovh.com>
9 years agocls_journal: remove duplicated key generation 8992/head
runsisi [Mon, 9 May 2016 07:15:31 +0000 (15:15 +0800)]
cls_journal: remove duplicated key generation

Signed-off-by: runsisi <runsisi@zte.com.cn>
9 years agocleanup: python: remove warnings of 'new blank line at EOF' 8989/head
Li Peng [Mon, 9 May 2016 03:28:42 +0000 (11:28 +0800)]
cleanup: python: remove warnings of 'new blank line at EOF'

When applying ceph patches, some warnings reported, e.g.
qa/workunits/mon/caps.py:367: new blank line at EOF.

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agocleanup: python: remove warnings of 'trailing whitespace'
Li Peng [Mon, 9 May 2016 03:25:08 +0000 (11:25 +0800)]
cleanup: python: remove warnings of 'trailing whitespace'

When applying ceph patches, some warnings reported, e.g.
doc/scripts/gen_state_diagram.py:99: trailing whitespace.

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agoos/filestore/FileJournal: optimize align_bl. 8798/head
Jianpeng Ma [Wed, 27 Apr 2016 23:59:59 +0000 (07:59 +0800)]
os/filestore/FileJournal: optimize align_bl.

Using is_aligned_size_and_memory replace is_aligned &&
is_n_aligned_size.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agocommon/buffer: For bufferlist add func is_aligned_size_and_memory.
Jianpeng Ma [Wed, 27 Apr 2016 23:31:14 +0000 (07:31 +0800)]
common/buffer: For bufferlist add func is_aligned_size_and_memory.

For directIO requirement, we need check bufferpt whether size aligned
and the address aligned. To do this, we should call is_aligned &&
is_n_align_sized. Every func also list all ptr of bufferlist.
To reduce one list, we add is_aligned_size_and_memroy(align_size,
align_memory) which only need list once.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoaos/bluestore/KernelDevice: optimize rebuild for aio_write.
Jianpeng Ma [Sat, 7 May 2016 23:16:28 +0000 (07:16 +0800)]
aos/bluestore/KernelDevice: optimize rebuild for aio_write.

For the requirement of directio, the content maybe rebuild.
In fact, rebuild_aligned_size_and_memory first check is_n_align_sized &&
is_algined and if need it rebuild.
So using rebuild_aligned_size_and_memory can remove the check.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agocommon/buffer: Change rebuild_aligned_* & rebuild_page_aligned API.
Jianpeng Ma [Fri, 29 Apr 2016 11:30:24 +0000 (19:30 +0800)]
common/buffer: Change rebuild_aligned_* & rebuild_page_aligned API.

Make those func return value from void to bool. Using the return value
we can know whether really rebuild content in order to optimize .

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoos/bluestore/BlueFS: remove the duplicate bufferlist.rebuild().
Jianpeng Ma [Wed, 27 Apr 2016 16:31:03 +0000 (00:31 +0800)]
os/bluestore/BlueFS: remove the duplicate bufferlist.rebuild().

In the later BlockDevice::aio_write(), it will rebuild again if
bufferlist need rebuild.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoosd/OSD.h: remove unneeded include file 8984/head
Michal Jarzabek [Mon, 2 May 2016 19:04:46 +0000 (20:04 +0100)]
osd/OSD.h: remove unneeded include file

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agotest/rgw: fix bucket checkpoint 8981/head
Yehuda Sadeh [Fri, 6 May 2016 22:32:50 +0000 (15:32 -0700)]
test/rgw: fix bucket checkpoint

Can refer to the incremental sync marker only if bucket is in the incremental
sync state.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoosd/OSD.h: change some data members to private 8919/head
Michal Jarzabek [Fri, 6 May 2016 20:41:19 +0000 (21:41 +0100)]
osd/OSD.h: change some data members to private

Move some data members of the OSDService from public to private access
specifier.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #8912 from markhpc/wip-promote-throttle-fix
Sage Weil [Fri, 6 May 2016 19:13:56 +0000 (15:13 -0400)]
Merge pull request #8912 from markhpc/wip-promote-throttle-fix

osd: fix reversed promote throttle default parameters

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #8902 from xiexingguo/xxg-wip-cheanup-osdmon
Sage Weil [Fri, 6 May 2016 19:13:26 +0000 (15:13 -0400)]
Merge pull request #8902 from xiexingguo/xxg-wip-cheanup-osdmon

mon/OSDMonitor: kill dead code

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8290 from yangdongsheng/chain_xattr
Sage Weil [Fri, 6 May 2016 19:13:01 +0000 (15:13 -0400)]
Merge pull request #8290 from yangdongsheng/chain_xattr

Fix unittest for chain_xattr.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #8173 from ceph/buffer-api-visibility
Sage Weil [Fri, 6 May 2016 19:12:08 +0000 (15:12 -0400)]
Merge pull request #8173 from ceph/buffer-api-visibility

buffer: fix iterator_impl visibility through typedef

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8289 from majianpeng/bluestore-zero-clear-tail-cache
Sage Weil [Fri, 6 May 2016 19:11:31 +0000 (15:11 -0400)]
Merge pull request #8289 from majianpeng/bluestore-zero-clear-tail-cache

os/bluestore/BlueStore: For _zero, check whether clear tail_bl.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8977 from liewegas/wip-ceph-tool
Samuel Just [Fri, 6 May 2016 19:01:35 +0000 (12:01 -0700)]
Merge pull request #8977 from liewegas/wip-ceph-tool

qa/workunits/rados/test_rados_tool: fix copy paste error

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8388 from dreamhost/wip-buildfix-mds-test
Gregory Farnum [Fri, 6 May 2016 18:57:44 +0000 (11:57 -0700)]
Merge pull request #8388 from dreamhost/wip-buildfix-mds-test

mds: build fix for LIBMDS consumer.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
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 agoosdc/Objecter: upper bound watch_check result 8967/head
Sage Weil [Fri, 6 May 2016 13:09:43 +0000 (09:09 -0400)]
osdc/Objecter: upper bound watch_check result

This way we always return a safe upper bound on the amount of time
since we did a check.  Among other things, this prevents us from
returning a value of 0, which is confusing.

Fixes: http://tracker.ceph.com/issues/15760
Signed-off-by: Sage Weil <sage@redhat.com>
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>