]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoceph-objectstore-tool: mount an ObjectStore via fuse
Sage Weil [Wed, 6 Jan 2016 22:53:43 +0000 (17:53 -0500)]
ceph-objectstore-tool: mount an ObjectStore via fuse

Currently only read-only.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agovstart.sh: put the OSD journal in the normal location
Sage Weil [Wed, 6 Jan 2016 21:19:14 +0000 (16:19 -0500)]
vstart.sh: put the OSD journal in the normal location

Also, drop the ability to run without a journal.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years ago[g]hobject_t: normalize operator<< result, and implement parse
Sage Weil [Tue, 5 Jan 2016 20:00:12 +0000 (15:00 -0500)]
[g]hobject_t: normalize operator<< result, and implement parse

- print hash in *bitwise reverse* order
- include all fields, every time
- use : delimitor for hobject_t
- use @ delimitor for ghobject_t
- escape unprintable characters <32, >=127, :, %.
  - also /, for fuse layer's benefit

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7195 from liewegas/wip-rados-bench
Sage Weil [Wed, 27 Jan 2016 18:22:01 +0000 (13:22 -0500)]
Merge pull request #7195 from liewegas/wip-rados-bench

rados: rados bench improvements

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7269 from liewegas/wip-bluestore-btree
Sage Weil [Wed, 27 Jan 2016 18:21:26 +0000 (13:21 -0500)]
Merge pull request #7269 from liewegas/wip-bluestore-btree

bluestore: use btree_map for allocator

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #6 from ifed01/wip-bluestore-btree-test 7269/head
Sage Weil [Wed, 27 Jan 2016 18:18:13 +0000 (13:18 -0500)]
Merge pull request #6 from ifed01/wip-bluestore-btree-test

UT for interval_set implementations

9 years agoMerge pull request #6869 from chuanhong-wang/chuanhong-wang-wip-14026
Sage Weil [Wed, 27 Jan 2016 18:14:23 +0000 (13:14 -0500)]
Merge pull request #6869 from chuanhong-wang/chuanhong-wang-wip-14026

osd: fix OSD utilization is abnormal after data disk lost

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7201 from ErwanAliasr1/evelu-cleanup-deadstuff
Sage Weil [Wed, 27 Jan 2016 18:13:47 +0000 (13:13 -0500)]
Merge pull request #7201 from ErwanAliasr1/evelu-cleanup-deadstuff

cleanup: remove misc dead code

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7217 from vumrao/wip-14356-vumrao
Sage Weil [Wed, 27 Jan 2016 18:13:00 +0000 (13:13 -0500)]
Merge pull request #7217 from vumrao/wip-14356-vumrao

osd: FileStore: cleanup: remove obsolete option "filestore_xattr_use_omap"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7245 from Sandy4999/wip-mon-election
Sage Weil [Wed, 27 Jan 2016 18:12:02 +0000 (13:12 -0500)]
Merge pull request #7245 from Sandy4999/wip-mon-election

mon: add an independent option for max election time

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #7253 from wido/mon-err-stuck-pg
Sage Weil [Wed, 27 Jan 2016 18:10:49 +0000 (13:10 -0500)]
Merge pull request #7253 from wido/mon-err-stuck-pg

mon: go into ERR state if multiple PGs are stuck inactive

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #7281 from xuechendi/omap_sync_assert
Sage Weil [Wed, 27 Jan 2016 18:09:36 +0000 (13:09 -0500)]
Merge pull request #7281 from xuechendi/omap_sync_assert

osd: FileStore: add error check for object_map->sync()

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7309 from asheplyakov/bug-14428
Sage Weil [Wed, 27 Jan 2016 18:08:43 +0000 (13:08 -0500)]
Merge pull request #7309 from asheplyakov/bug-14428

osd: PG::activate(): handle unexpected cached_removed_snaps more gracefully

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7319 from chenji-kael/wip-cls-clear-pool
Sage Weil [Wed, 27 Jan 2016 18:07:53 +0000 (13:07 -0500)]
Merge pull request #7319 from chenji-kael/wip-cls-clear-pool

test/cls: clean useless pools

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7320 from yuyuyu101/kill-keyvaluestore
Sage Weil [Wed, 27 Jan 2016 18:07:13 +0000 (13:07 -0500)]
Merge pull request #7320 from yuyuyu101/kill-keyvaluestore

os/keyvaluestore: kill KeyValueStore

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7375 from rzarzynski/wip-14526
Orit Wasserman [Wed, 27 Jan 2016 16:50:10 +0000 (17:50 +0100)]
Merge pull request #7375 from rzarzynski/wip-14526

rgw: fix dangeours usage of strtok in RGWAccessControlPolicy_SWIFT

9 years agoAdd UT for interval_set implementations
Igor Fedotov [Wed, 27 Jan 2016 16:25:23 +0000 (19:25 +0300)]
Add UT for interval_set implementations

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #7379 from branch-predictor/bp-async-fixes-0127
Sage Weil [Wed, 27 Jan 2016 15:49:22 +0000 (10:49 -0500)]
Merge pull request #7379 from branch-predictor/bp-async-fixes-0127

msg/async: bunch of fixes

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: bunch of fixes 7379/head
Piotr Dałek [Mon, 25 Jan 2016 08:38:06 +0000 (09:38 +0100)]
msg/async: bunch of fixes

1. Use MSG_MORE in sendmsg to reduce number of actual sends and pass hint
   to do_sendmsg in callers.
2. Move restore_sigpipe() outside of loop in do_sendmsg().
3. restore_sigpipe when hit the error condition in do_sendmsg().
3. When sent_bytes >= outcoming_bl.length, don't swap outgoing_bl with
   bl and wait for bl to get out of scope, just clear out outgoing_bl.
4. Don't swap empty outcoming_bl with bl, always claim_append(bl).

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge pull request #7329 from fullerdj/wip-14476
Jason Dillaman [Wed, 27 Jan 2016 14:11:55 +0000 (09:11 -0500)]
Merge pull request #7329 from fullerdj/wip-14476

librbd: remove canceled tasks from timer thread

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agorgw: fix dangeours usage of strtok in RGWAccessControlPolicy_SWIFT. 7375/head
Radoslaw Zarzynski [Wed, 27 Jan 2016 13:47:19 +0000 (14:47 +0100)]
rgw: fix dangeours usage of strtok in RGWAccessControlPolicy_SWIFT.

Fixes: #14526
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoMerge pull request #7120 from zaitcev/wip-5073-update1 7318/head
Yehuda Sadeh [Tue, 26 Jan 2016 22:48:51 +0000 (14:48 -0800)]
Merge pull request #7120 from zaitcev/wip-5073-update1

rgw: fix up the use of tenant before it's available

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7366 from tchaikov/wip-cmake-snappy
Ali Maredia [Tue, 26 Jan 2016 18:26:34 +0000 (13:26 -0500)]
Merge pull request #7366 from tchaikov/wip-cmake-snappy

cmake: check for libsnappy in default path also

9 years agocmake: check for libsnappy in default path also 7366/head
Kefu Chai [Tue, 26 Jan 2016 13:07:04 +0000 (21:07 +0800)]
cmake: check for libsnappy in default path also

* some distros install libsnappy into /usr/lib/x86_64-linux-gnu
  which is completely resonable. but this directory is not listed
  in the Findsnappy.cmake.
* also add SNAPPY_ROOT_DIR, in case user install snappy in some
  other directory.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7304 from liewegas/wip-tcmalloc
Sage Weil [Tue, 26 Jan 2016 14:59:03 +0000 (09:59 -0500)]
Merge pull request #7304 from liewegas/wip-tcmalloc

osd: pass tcmalloc env through to daemon

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #7358 from chenyehua11692/master
Gregory Farnum [Tue, 26 Jan 2016 14:41:45 +0000 (06:41 -0800)]
Merge pull request #7358 from chenyehua11692/master

mds:judgment added to avoid the risk of visiting the NULL pointer

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoupstart/ceph-osd.conf: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through 7304/head
Sage Weil [Tue, 26 Jan 2016 13:43:15 +0000 (08:43 -0500)]
upstart/ceph-osd.conf: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomds:judgment added to avoid the risk of visting the NULL pointer 7358/head
Kongming Wu [Tue, 26 Jan 2016 02:45:52 +0000 (10:45 +0800)]
mds:judgment added to avoid the risk of visting the NULL pointer

Signed-off-by: chenyehua11692 chen.yehua@h3c.com
9 years agoMerge pull request #7251 from tchaikov/wip-rados-manpage
Sage Weil [Tue, 26 Jan 2016 02:28:09 +0000 (21:28 -0500)]
Merge pull request #7251 from tchaikov/wip-rados-manpage

doc: amend the rados.8

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7353 from renhwsky/renhw-wip-14473-2
Sage Weil [Tue, 26 Jan 2016 02:21:21 +0000 (21:21 -0500)]
Merge pull request #7353 from renhwsky/renhw-wip-14473-2

mon: fix locking in preinit error paths

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7321 from renhwsky/renhw-wip-14473
Sage Weil [Tue, 26 Jan 2016 02:20:27 +0000 (21:20 -0500)]
Merge pull request #7321 from renhwsky/renhw-wip-14473

mon: drop useless rank init assignment

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agomon: drop useless rank init assignment 7321/head
huanwen ren [Tue, 26 Jan 2016 02:12:02 +0000 (10:12 +0800)]
mon: drop useless rank init assignment

drop useless rank init assignment

Fixes:14508
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agoMerge pull request #7294 from branch-predictor/bp-buffer-spinlock
Sage Weil [Tue, 26 Jan 2016 02:05:32 +0000 (21:05 -0500)]
Merge pull request #7294 from branch-predictor/bp-buffer-spinlock

common/buffer: replace RWLock with spinlocks

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: song baisen <song.baisen@zte.com.cn>
9 years agoMerge pull request #7303 from cbodley/wip-tx-move
Sage Weil [Tue, 26 Jan 2016 02:04:21 +0000 (21:04 -0500)]
Merge pull request #7303 from cbodley/wip-tx-move

os/ObjectStore: add custom move operations for ObjectStore::Transaction

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7283 from xiexingguo/xxg-wip-14407
Sage Weil [Tue, 26 Jan 2016 01:59:35 +0000 (20:59 -0500)]
Merge pull request #7283 from xiexingguo/xxg-wip-14407

os/bluestore/kstore: fix nid overwritten logic

http://pulpito.ceph.com/sage-2016-01-25_07:39:08-rados-wip-sage-testing2---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7267 from liewegas/wip-fiemap
Sage Weil [Tue, 26 Jan 2016 01:58:37 +0000 (20:58 -0500)]
Merge pull request #7267 from liewegas/wip-fiemap

osd: drop fiemap len=0 magic

http://pulpito.ceph.com/sage-2016-01-25_07:39:08-rados-wip-sage-testing2---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agomon: fix locking in preinit error paths 7353/head
renhwztetecs [Tue, 26 Jan 2016 01:51:16 +0000 (09:51 +0800)]
mon: fix locking in preinit error paths

fix locking in preinit error paths

Fixes: #14473
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agorados: bench: add --max-objects 7195/head
Sage Weil [Wed, 13 Jan 2016 18:05:49 +0000 (13:05 -0500)]
rados: bench: add --max-objects

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7314 from tchaikov/wip-fix-cmake
Casey Bodley [Mon, 25 Jan 2016 14:55:26 +0000 (09:55 -0500)]
Merge pull request #7314 from tchaikov/wip-fix-cmake

cmake: let ceph-client-debug link with tcmalloc

9 years agoMerge pull request #7331 from XinzeChi/wip-RepModify-bytes-written
Kefu Chai [Mon, 25 Jan 2016 13:33:58 +0000 (21:33 +0800)]
Merge pull request #7331 from XinzeChi/wip-RepModify-bytes-written

osd: delete useless bytes_written defined in RepModify

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoPG::activate(): handle unexpected cached_removed_snaps more gracefully 7309/head
Alexey Sheplyakov [Thu, 21 Jan 2016 06:42:09 +0000 (09:42 +0300)]
PG::activate(): handle unexpected cached_removed_snaps more gracefully

PGPool::update(): ditto

Fixes: #14428
Backport: infernalis, hammer, firefly

Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
9 years agoMerge pull request #7342 from tchaikov/wip-fix-ceph-dencoder
Loic Dachary [Mon, 25 Jan 2016 08:59:14 +0000 (15:59 +0700)]
Merge pull request #7342 from tchaikov/wip-fix-ceph-dencoder

os/bluestore: fix bluestore_wal_transaction_t encoding test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoos/bluestore: fix bluestore_wal_transaction_t encoding test 7342/head
Kefu Chai [Mon, 25 Jan 2016 07:08:02 +0000 (15:08 +0800)]
os/bluestore: fix bluestore_wal_transaction_t encoding test

bluestore_wal_op_t::op is encoded/dumped but it is not
initialized in its ctor. so set it to 0 in its ctor. 0 is not an
valid op though, but it helps with debugging and testing.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7315 from tchaikov/wip-kill-warnings
Loic Dachary [Mon, 25 Jan 2016 06:20:08 +0000 (13:20 +0700)]
Merge pull request #7315 from tchaikov/wip-kill-warnings

Wip kill warnings

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7284 from ceph/wip-make-remove-libedit
Loic Dachary [Mon, 25 Jan 2016 06:15:48 +0000 (13:15 +0700)]
Merge pull request #7284 from ceph/wip-make-remove-libedit

makefile: remove libedit from libclient.la

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoosd: delete useless bytes_written defined in RepModify 7331/head
Xinze Chi [Sat, 23 Jan 2016 02:20:06 +0000 (10:20 +0800)]
osd: delete useless bytes_written defined in RepModify

this would avoid calling encode function.

Signed-off-by: Xinze Chi <xinze@xsky.com>
9 years agoMerge pull request #7301 from oritwas/wip-14375
Yehuda Sadeh [Fri, 22 Jan 2016 21:33:26 +0000 (13:33 -0800)]
Merge pull request #7301 from oritwas/wip-14375

rgw: fix subuser rm command failure

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorbd: remove canceled tasks from timer thread 7329/head
Douglas Fuller [Fri, 22 Jan 2016 19:18:40 +0000 (11:18 -0800)]
rbd: remove canceled tasks from timer thread

When canceling scheduled tasks using the timer thread, TaskFinisher::cancel
does not call SafeTimer::cancel_event, so events fire anyway. Add this call.

Fixes: #14476
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
9 years agoMerge pull request #7327 from igrcic/master
John Wilkins [Fri, 22 Jan 2016 19:09:38 +0000 (11:09 -0800)]
Merge pull request #7327 from igrcic/master

doc: Fixes a CRUSH map step take argument

Reviewed-by: John Wilkins <jowilkin@redhat.com>
9 years agodoc: Fixes a CRUSH map step take argument 7327/head
Ivan Grcic [Fri, 22 Jan 2016 17:58:03 +0000 (18:58 +0100)]
doc: Fixes a CRUSH map step take argument

Signed-off-by: Ivan Grcic <igrcic@gmail.com>
9 years agoos: add custom move ctor/assignment for Transaction 7303/head
Casey Bodley [Thu, 21 Jan 2016 15:02:39 +0000 (10:02 -0500)]
os: add custom move ctor/assignment for Transaction

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoos: add custom move ctor/assignment for TransactionData
Casey Bodley [Wed, 20 Jan 2016 22:18:08 +0000 (17:18 -0500)]
os: add custom move ctor/assignment for TransactionData

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoos: Transaction sets default values to avoid duplication in ctors
Casey Bodley [Thu, 21 Jan 2016 14:45:05 +0000 (09:45 -0500)]
os: Transaction sets default values to avoid duplication in ctors

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoos: move Transaction ctors closer to member variables
Casey Bodley [Thu, 21 Jan 2016 14:42:06 +0000 (09:42 -0500)]
os: move Transaction ctors closer to member variables

this makes it easier to update constructors when adding/removing fields

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agotest: add unit test for Transaction move/copy
Casey Bodley [Wed, 20 Jan 2016 22:17:39 +0000 (17:17 -0500)]
test: add unit test for Transaction move/copy

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agocleanup: remove obsolete option "filestore_xattr_use_omap" 7217/head
Vikhyat Umrao [Wed, 13 Jan 2016 12:56:23 +0000 (18:26 +0530)]
cleanup: remove obsolete option "filestore_xattr_use_omap"

This patch does cleanup for option "filestore_xattr_use_omap",
as this option was removed in #7408.

Fixes: #14356
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
9 years agoKeyValueStore: Kill this 7320/head
Haomai Wang [Fri, 22 Jan 2016 02:28:42 +0000 (10:28 +0800)]
KeyValueStore: Kill this

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agotest/cls :clean useless pools 7319/head
Ji Chen [Thu, 21 Jan 2016 09:52:47 +0000 (17:52 +0800)]
test/cls :clean useless pools

After do ./ceph_test_cls_log ,pools remains
need be destroyed.

Signed-off-by: Ji Chen <insomnia@139.com>
9 years agorgw: fix up the use of tenant before it's available 7120/head
Pete Zaitcev [Wed, 6 Jan 2016 07:02:11 +0000 (00:02 -0700)]
rgw: fix up the use of tenant before it's available

A big problem that cropped up with the multi-tenancy as it
went in was that it used tenant to initialize bucket names
before tenant was actually available by parsing a token.
Thus, although multi-tenancy worked, accessing anything across
tenants was actually impossible. This patch fixes that oversight.
Unfortunately, a new method postauth_init() was needed for it.

We also fix small bugs:

 - validate_tenant_name() used a proper-looking C++ but was
   incorrect. We simply use C for now, which may be not as
   pretty but is correct.

 - We now make a distinction between empty tenant syntax that
   means "the logged-in tenant" ("bucket") and the syntax
   that means "the legacy compatibility tenant with no name
   (":bucket").

 - We make rgw_make_bucket_entry_name() more robust against
   empty inputs. It's not used for work, but produces odd-looking
   debugging logs.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
9 years agoMerge pull request #7317 from dmick/master
Yehuda Sadeh [Thu, 21 Jan 2016 23:38:05 +0000 (15:38 -0800)]
Merge pull request #7317 from dmick/master

configure.ac: make "--with-librocksdb-static" default to 'check'

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoconfigure.ac: make "--with-librocksdb-static" default to 'check' 7317/head
Dan Mick [Thu, 21 Jan 2016 18:56:50 +0000 (10:56 -0800)]
configure.ac: make "--with-librocksdb-static" default to 'check'

Fixes: #14463
Signed-off-by: Dan Mick <dan.mick@redhat.com>
9 years agolibrbd: fixed "hidden" virtual methods 7315/head
Kefu Chai [Thu, 21 Jan 2016 17:40:26 +0000 (09:40 -0800)]
librbd: fixed "hidden" virtual methods

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: let ceph-client-debug link with tcmalloc 7314/head
Kefu Chai [Thu, 21 Jan 2016 17:37:55 +0000 (01:37 +0800)]
cmake: let ceph-client-debug link with tcmalloc

to fix the link problem of
libcephfs.so.1.0.0: undefined reference to `IsHeapProfilerRunning'
when tcmalloc is used and profiler header is detected.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest/objectstore: fix unused variable warnings
Kefu Chai [Thu, 21 Jan 2016 17:37:58 +0000 (09:37 -0800)]
test/objectstore: fix unused variable warnings

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoinclude/[btree_]interval_set: drop useless assert
Sage Weil [Thu, 21 Jan 2016 16:00:29 +0000 (11:00 -0500)]
include/[btree_]interval_set: drop useless assert

This mirrors the condition above.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoinclude/[btree_]interval_set: use std::swap
Sage Weil [Thu, 21 Jan 2016 15:59:35 +0000 (10:59 -0500)]
include/[btree_]interval_set: use std::swap

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/FreelistManager: use btree_map::erase return value
Sage Weil [Thu, 21 Jan 2016 15:58:01 +0000 (10:58 -0500)]
os/bluestore/FreelistManager: use btree_map::erase return value

The btree_map erase() returns an iterator for the next element.
Perfect!

Reported-by: Igor Fedotov <ifedotov@mirantis.com>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7310 from trociny/fix-rbd-replay-eof
Jason Dillaman [Thu, 21 Jan 2016 14:05:31 +0000 (09:05 -0500)]
Merge pull request #7310 from trociny/fix-rbd-replay-eof

rbd-replay: handle EOF gracefully

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-replay: handle EOF gracefully 7310/head
Mykola Golub [Thu, 21 Jan 2016 11:45:42 +0000 (13:45 +0200)]
rbd-replay: handle EOF gracefully

Fixes: #14452
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #7292 from tchaikov/wip-submittingpatches
Kefu Chai [Thu, 21 Jan 2016 13:10:53 +0000 (21:10 +0800)]
Merge pull request #7292 from tchaikov/wip-submittingpatches

doc: revise SubmittingPatches

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agoMerge pull request #7263 from theanalyst/vstart/update-opts
Kefu Chai [Thu, 21 Jan 2016 13:01:07 +0000 (21:01 +0800)]
Merge pull request #7263 from theanalyst/vstart/update-opts

vstart: update help with a few more commandline opts

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: vstart update a few commandline switches 7263/head
Abhishek Lekshmanan [Mon, 18 Jan 2016 10:57:42 +0000 (11:57 +0100)]
doc: vstart update a few commandline switches

Add a few more available commandline switches to vstart quickstart
documentation

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #7240 from cxwshawn/org-fix
Loic Dachary [Thu, 21 Jan 2016 12:46:14 +0000 (19:46 +0700)]
Merge pull request #7240 from cxwshawn/org-fix

organizationmap: modify org mail info.

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoSubmittingPatches: rebase to resolve conflicts 7292/head
Kefu Chai [Thu, 21 Jan 2016 04:52:54 +0000 (12:52 +0800)]
SubmittingPatches: rebase to resolve conflicts

pull request is not supposed to contain merge commits

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoSubmittingPatches: sending kernel patches to mailing list
Kefu Chai [Thu, 21 Jan 2016 04:41:03 +0000 (12:41 +0800)]
SubmittingPatches: sending kernel patches to mailing list

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoSubmittingPatches: add doc for commit title
Kefu Chai [Wed, 20 Jan 2016 08:54:57 +0000 (16:54 +0800)]
SubmittingPatches: add doc for commit title

explain that we need a prefix in the commit title

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoSubmittingPatches: add doc for "Fixes:" tag
Kefu Chai [Wed, 20 Jan 2016 08:23:04 +0000 (16:23 +0800)]
SubmittingPatches: add doc for "Fixes:" tag

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoSubmittingPatches: update with reST syntax
Kefu Chai [Wed, 20 Jan 2016 05:40:01 +0000 (13:40 +0800)]
SubmittingPatches: update with reST syntax

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7293 from xiexingguo/xxg-wip-14436
Sage Weil [Thu, 21 Jan 2016 01:36:53 +0000 (20:36 -0500)]
Merge pull request #7293 from xiexingguo/xxg-wip-14436

os/bluestore: fix assert

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoinit-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through
Sage Weil [Wed, 20 Jan 2016 23:36:08 +0000 (18:36 -0500)]
init-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through

..when set in the sysconfig/default file.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7197 from ceph/wip-kill-warnings
Sage Weil [Wed, 20 Jan 2016 23:16:55 +0000 (18:16 -0500)]
Merge pull request #7197 from ceph/wip-kill-warnings

build: fix warnings

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7232 from lzhng2000/master
Sage Weil [Wed, 20 Jan 2016 23:16:17 +0000 (18:16 -0500)]
Merge pull request #7232 from lzhng2000/master

cls/cls_rbd: pass string by reference

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7242 from xiexingguo/xxg-wip-14370
Sage Weil [Wed, 20 Jan 2016 23:15:44 +0000 (18:15 -0500)]
Merge pull request #7242 from xiexingguo/xxg-wip-14370

os/memstore: drain finisher first before we really begin a umount-process
os/bluestore: drain wal_wq on replay error

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7247 from ifed01/wip-14383
Sage Weil [Wed, 20 Jan 2016 23:13:43 +0000 (18:13 -0500)]
Merge pull request #7247 from ifed01/wip-14383

os/bluestore: use intrusive_ptr for Dir

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7254 from guangyy/wip-counter
Sage Weil [Wed, 20 Jan 2016 23:13:00 +0000 (18:13 -0500)]
Merge pull request #7254 from guangyy/wip-counter

common: change the type of counter total/unhealthy_workers

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7255 from yuyuyu101/wip-14386
Sage Weil [Wed, 20 Jan 2016 23:12:25 +0000 (18:12 -0500)]
Merge pull request #7255 from yuyuyu101/wip-14386

msg/async: fix send closed local_connection message problem

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Wed, 20 Jan 2016 21:49:12 +0000 (16:49 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #7300 from ceph/wip-cmake
Casey Bodley [Wed, 20 Jan 2016 21:12:45 +0000 (16:12 -0500)]
Merge pull request #7300 from ceph/wip-cmake

cmake: test_build_libcephfs needs ${ALLOC_LIBS}

9 years agorgw: fix subuser rm command failure 7301/head
Orit Wasserman [Wed, 20 Jan 2016 16:24:38 +0000 (17:24 +0100)]
rgw: fix subuser rm command failure

Fixes: 14375
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agocmake: test_build_libcephfs needs ${ALLOC_LIBS} 7300/head
Ali Maredia [Wed, 20 Jan 2016 19:41:28 +0000 (14:41 -0500)]
cmake: test_build_libcephfs needs ${ALLOC_LIBS}

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoinclude/interval_set: clean up std usage
Sage Weil [Wed, 20 Jan 2016 15:42:23 +0000 (10:42 -0500)]
include/interval_set: clean up std usage

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/StupidAllocator: use btree_map<> instead of map<>
Sage Weil [Wed, 13 Jan 2016 21:51:23 +0000 (16:51 -0500)]
os/bluestore/StupidAllocator: use btree_map<> instead of map<>

btree_map uses about half the memory.  According to the cpp-btree docs they
are also faster than STL maps... especially when they get big.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/FreelistManager: use btree_map instead of map
Sage Weil [Wed, 13 Jan 2016 19:53:37 +0000 (14:53 -0500)]
os/bluestore/FreelistManager: use btree_map instead of map

btree_map is about twice as memory efficient.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph_test_rados: clean up std usage
Sage Weil [Wed, 20 Jan 2016 02:12:41 +0000 (21:12 -0500)]
ceph_test_rados: clean up std usage

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoinclude: add btree_interval_map
Sage Weil [Wed, 13 Jan 2016 20:54:58 +0000 (15:54 -0500)]
include: add btree_interval_map

A few small changes to interval_map to deal with the fact that any btree
change invalidates all iterators.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoinclude/cpp-btree: add google's cpp-btree library
Sage Weil [Wed, 13 Jan 2016 20:36:21 +0000 (15:36 -0500)]
include/cpp-btree: add google's cpp-btree library

From https://github.com/algorithm-ninja/cpp-btree.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7231 from renhwsky/renhw-wip-14369
Kefu Chai [Wed, 20 Jan 2016 13:18:28 +0000 (21:18 +0800)]
Merge pull request #7231 from renhwsky/renhw-wip-14369

osd: remove unused OSDMap::set_weightf()

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoBlueStore/StupidAllocator: fix assert 7293/head
xie xingguo [Wed, 20 Jan 2016 09:28:02 +0000 (17:28 +0800)]
BlueStore/StupidAllocator: fix assert

Fixes: #14436
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7164 from flaf/master
Kefu Chai [Wed, 20 Jan 2016 08:37:50 +0000 (16:37 +0800)]
Merge pull request #7164 from flaf/master

doc: fix "mon osd down out subtree limit" option name

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: fix "mon osd down out subtree limit" option name 7164/head
lafont [Sat, 9 Jan 2016 04:38:25 +0000 (05:38 +0100)]
doc: fix "mon osd down out subtree limit" option name

The name of the parameter `mon osd down out subtree limit`
was incorrect (with `downout` instead of `down out`).
Furthermore, the description seemed to me a little bit
ambiguous.

Signed-off-by: François Lafont <francois.lafont@ac-versailles.fr>