]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agomon: PG Monitor should report backfill_wait
Abhishek Lekshmanan [Thu, 28 Jan 2016 13:54:24 +0000 (14:54 +0100)]
mon: PG Monitor should report backfill_wait

Instead of backfill as it is actually waiting for backfill instead of
actually backfilling

Fixes: #12744
Reported-by: Dan Mick <dmick@redhat.com>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #7075 from shun-s/shun-fix
Sage Weil [Fri, 29 Jan 2016 13:28:30 +0000 (08:28 -0500)]
Merge pull request #7075 from shun-s/shun-fix

global: do not start two daemons with a single pid-file

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7111 from chenji-kael/master
Sage Weil [Fri, 29 Jan 2016 13:28:03 +0000 (08:28 -0500)]
Merge pull request #7111 from chenji-kael/master

osd: FileStore: print file name before osd assert if read file failed

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7268 from ifed01/wip-14400
Sage Weil [Fri, 29 Jan 2016 13:27:13 +0000 (08:27 -0500)]
Merge pull request #7268 from ifed01/wip-14400

common: snappy decompressor may assert when handling segmented input bufferlist

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7276 from caibo2014/fix-messager-null
Sage Weil [Fri, 29 Jan 2016 13:26:39 +0000 (08:26 -0500)]
Merge pull request #7276 from caibo2014/fix-messager-null

mon/MonClient: avoid null pointer error when configured incorrectly

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7330 from ifed01/wip-pool-stat-cleanup
Sage Weil [Fri, 29 Jan 2016 13:26:05 +0000 (08:26 -0500)]
Merge pull request #7330 from ifed01/wip-pool-stat-cleanup

librados: remove duplicate definitions for rados pool_stat_t and cluster_stat_t

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7340 from ceph/wip-portable-time
Sage Weil [Fri, 29 Jan 2016 13:25:36 +0000 (08:25 -0500)]
Merge pull request #7340 from ceph/wip-portable-time

common: ake ceph_time clocks work under BSD

Reviewed-by: Erwan Velu <erwan@redhat.com>
9 years agoMerge pull request #7341 from songbaisen/song7
Sage Weil [Fri, 29 Jan 2016 13:24:46 +0000 (08:24 -0500)]
Merge pull request #7341 from songbaisen/song7

mon: consider the pool size when setting pool crush rule

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7355 from yuanjingkai/master
Sage Weil [Fri, 29 Jan 2016 13:24:04 +0000 (08:24 -0500)]
Merge pull request #7355 from yuanjingkai/master

os/fs: fix io_getevents argument

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7348 from xiexingguo/xxg-wip-14484
Sage Weil [Fri, 29 Jan 2016 13:23:23 +0000 (08:23 -0500)]
Merge pull request #7348 from xiexingguo/xxg-wip-14484

osd: BlueStore: fix space leak

http://pulpito.ceph.com/sage-2016-01-27_18:39:48-rados-wip-sage-testing---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7368 from somnathr/wip-jemalloc-build
Sage Weil [Fri, 29 Jan 2016 13:22:55 +0000 (08:22 -0500)]
Merge pull request #7368 from somnathr/wip-jemalloc-build

build: allow jemalloc enabled build with rocksdb-static

http://pulpito.ceph.com/sage-2016-01-27_18:39:48-rados-wip-sage-testing---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'origin/greg-fs-testing-126' 7282/head
Greg Farnum [Fri, 29 Jan 2016 05:28:48 +0000 (21:28 -0800)]
Merge remote-tracking branch 'origin/greg-fs-testing-126'

9 years agoMerge remote-tracking branch 'origin/jewel'
Greg Farnum [Fri, 29 Jan 2016 05:28:37 +0000 (21:28 -0800)]
Merge remote-tracking branch 'origin/jewel'

9 years agoMerge pull request #7312 from jcsp/wip-14365
Gregory Farnum [Fri, 29 Jan 2016 05:28:54 +0000 (21:28 -0800)]
Merge pull request #7312 from jcsp/wip-14365

mds, client: fix locking around handle_conf_change

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #7297 from ukernel/jewel-13903
Gregory Farnum [Fri, 29 Jan 2016 05:28:09 +0000 (21:28 -0800)]
Merge pull request #7297 from ukernel/jewel-13903

client: properly trim unlinked inode

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7262 from ukernel/jewel-14380
Gregory Farnum [Fri, 29 Jan 2016 05:26:06 +0000 (21:26 -0800)]
Merge pull request #7262 from ukernel/jewel-14380

Be more careful about the "mds setmap" command to prevent breakage.

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #7369 from mauri/fix-message-typo
Jason Dillaman [Fri, 29 Jan 2016 03:25:19 +0000 (22:25 -0500)]
Merge pull request #7369 from mauri/fix-message-typo

rbd: fix error message typo

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7387 from theanalyst/fix/gitignore
Kefu Chai [Fri, 29 Jan 2016 02:00:20 +0000 (10:00 +0800)]
Merge pull request #7387 from theanalyst/fix/gitignore

remove unused src/messages/#MOSDOp.h# file

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7345 from x11562/rbd_snap_rename
Josh Durgin [Thu, 28 Jan 2016 17:05:00 +0000 (09:05 -0800)]
Merge pull request #7345 from x11562/rbd_snap_rename

rbd: add "--dest-snap" optional for snap rename

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7393 from tchaikov/wip-cmake
Kefu Chai [Thu, 28 Jan 2016 16:43:38 +0000 (00:43 +0800)]
Merge pull request #7393 from tchaikov/wip-cmake

fix the autotools and cmake build (the new fusestore needs libfuse)

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #7403 from rzarzynski/wip-rgw-dumpconlen-cosmetics
Orit Wasserman [Thu, 28 Jan 2016 16:30:52 +0000 (17:30 +0100)]
Merge pull request #7403 from rzarzynski/wip-rgw-dumpconlen-cosmetics

rgw: cosmetic improvements in dump_content_length()

9 years agorgw: cosmetic improvements in dump_content_length(). 7403/head
Radoslaw Zarzynski [Thu, 28 Jan 2016 16:19:56 +0000 (17:19 +0100)]
rgw: cosmetic improvements in dump_content_length().

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoceph-objectstore-tool: disable fuse support if !HAVE_LIBFUSE 7393/head
Kefu Chai [Thu, 28 Jan 2016 12:43:45 +0000 (20:43 +0800)]
ceph-objectstore-tool: disable fuse support if !HAVE_LIBFUSE

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoosd: disable FuseStore if !HAVE_LIBFUSE
Kefu Chai [Thu, 28 Jan 2016 09:45:30 +0000 (17:45 +0800)]
osd: disable FuseStore if !HAVE_LIBFUSE

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomake: disable FuseStore if !WITH_FUSE
Kefu Chai [Thu, 28 Jan 2016 09:23:23 +0000 (17:23 +0800)]
make: disable FuseStore if !WITH_FUSE

* configure.ac: "#define HAVE_LIBFUSE" if libfuse is found
* os/Makefile.am: do not compile FuseStore.cc if libfuse is not found

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: link against libfuse if HAVE_LIBFUSE
Kefu Chai [Thu, 28 Jan 2016 06:47:07 +0000 (14:47 +0800)]
cmake: link against libfuse if HAVE_LIBFUSE

* use ${FUSE_LIBRARIES} instead of "fuse" when referencing libfuse.
* do not compile FuseStore.cc if !HAVE_LIBFUSE.
* CMakeLists.txt: s/HAVE_FUSE/HAVE_LIBFUSE/, to match with the one
  defined for config.h.in.cmake, otherwise we need two vars:
  HAVE_LIBFUSE, and HAVE_FUSE

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: remove the copyright of FindSnappy.cmake
Kefu Chai [Thu, 28 Jan 2016 07:04:40 +0000 (15:04 +0800)]
cmake: remove the copyright of FindSnappy.cmake

as we've basically removed all the HyperTable code.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6875 from dx9/wip-cmake-ccache
Kefu Chai [Thu, 28 Jan 2016 07:35:16 +0000 (15:35 +0800)]
Merge pull request #6875 from dx9/wip-cmake-ccache

cmake: support ccache via a WITH_CCACHE build option

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorbd: simplify snap rename arguments 7345/head
x11562 [Tue, 26 Jan 2016 05:52:46 +0000 (13:52 +0800)]
rbd: simplify snap rename arguments

Signed-off-by: Na Xie <xie.na@h3c.com>
9 years agoMerge pull request #7337 from clever215/rbd_nbd
Josh Durgin [Wed, 27 Jan 2016 22:47:56 +0000 (14:47 -0800)]
Merge pull request #7337 from clever215/rbd_nbd

rbd-nbd: Add an argument validation for nbds_max

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7385 from trociny/fix-journal-flush-commit-position
Josh Durgin [Wed, 27 Jan 2016 22:45:49 +0000 (14:45 -0800)]
Merge pull request #7385 from trociny/fix-journal-flush-commit-position

journal: flush commit position on metadata shutdown

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7382 from dillaman/wip-14510
Josh Durgin [Wed, 27 Jan 2016 22:44:59 +0000 (14:44 -0800)]
Merge pull request #7382 from dillaman/wip-14510

librbd: block maintenance ops until after journal is ready

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7259 from trociny/wip-14264
Josh Durgin [Wed, 27 Jan 2016 22:35:13 +0000 (14:35 -0800)]
Merge pull request #7259 from trociny/wip-14264

librbd: API: async open and close

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7302 from dillaman/wip-14434
Josh Durgin [Wed, 27 Jan 2016 22:34:57 +0000 (14:34 -0800)]
Merge pull request #7302 from dillaman/wip-14434

librbd: journal shut down flush race condition

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7299 from dillaman/wip-librbd-update-features
Josh Durgin [Wed, 27 Jan 2016 22:34:43 +0000 (14:34 -0800)]
Merge pull request #7299 from dillaman/wip-librbd-update-features

librbd: fix internal handling of dynamic feature updates

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agogitignore: ignore backup files from editors etc. 7387/head
Abhishek Lekshmanan [Wed, 27 Jan 2016 22:23:18 +0000 (23:23 +0100)]
gitignore: ignore backup files from editors etc.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoremove unused source file
Abhishek Lekshmanan [Wed, 27 Jan 2016 22:16:00 +0000 (23:16 +0100)]
remove unused source file

This file was possibly accidentally committed in the tree, thanks
@BranchPredictor for bringing this up in irc

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #7381 from ceph/wip-rgw-static-website-yehuda
Yehuda Sadeh [Wed, 27 Jan 2016 20:36:35 +0000 (12:36 -0800)]
Merge pull request #7381 from ceph/wip-rgw-static-website-yehuda

RGW static website feature
 - currently disabled by default
 - partial error page handling
 - a few known failures

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agojournal: flush commit position on metadata shutdown 7385/head
Mykola Golub [Sun, 24 Jan 2016 10:26:36 +0000 (12:26 +0200)]
journal: flush commit position on metadata shutdown

A crash was observed on JournalTrimmer destroy, which was called
by the Journaler after metadata shutdown. JournalTrimmer destructor
also calls flush_commit_position, but at that time metadata m_timer
is already null and it crushed there.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #7223 from liewegas/wip-collection-handles
Sage Weil [Wed, 27 Jan 2016 19:45:11 +0000 (14:45 -0500)]
Merge pull request #7223 from liewegas/wip-collection-handles

osd: collection handles

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #7134 from liewegas/wip-fusestore
Sage Weil [Wed, 27 Jan 2016 19:39:21 +0000 (14:39 -0500)]
Merge pull request #7134 from liewegas/wip-fusestore

osd: implement fuse interface for ObjectStore

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoosd: use collection handle where possible 7223/head
Sage Weil [Mon, 18 Jan 2016 16:10:05 +0000 (11:10 -0500)]
osd: use collection handle where possible

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: associate a CollectionHandle& with PGBackend
Sage Weil [Mon, 18 Jan 2016 17:43:11 +0000 (12:43 -0500)]
osd: associate a CollectionHandle& with PGBackend

Make this a ref to the PG's handle because the backend is
constructed before the handle is opened.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: associate a CollectionHandle with each PG
Sage Weil [Mon, 18 Jan 2016 16:07:28 +0000 (11:07 -0500)]
osd: associate a CollectionHandle with each PG

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/memstore: implement handle-based read methods
Sage Weil [Mon, 18 Jan 2016 16:05:51 +0000 (11:05 -0500)]
os/memstore: implement handle-based read methods

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/memstore: implement open_collection
Sage Weil [Mon, 18 Jan 2016 16:05:32 +0000 (11:05 -0500)]
os/memstore: implement open_collection

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: implement CollectionHandle based read methods
Sage Weil [Mon, 18 Jan 2016 16:05:00 +0000 (11:05 -0500)]
os/bluestore: implement CollectionHandle based read methods

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: implement open_collection
Sage Weil [Mon, 18 Jan 2016 16:04:41 +0000 (11:04 -0500)]
os/bluestore: implement open_collection

Fix up create and remove so that they poison a Collection that
gets removed.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/ObjectStore: add CollectionHandle wrappers for all read ops
Sage Weil [Mon, 18 Jan 2016 14:36:36 +0000 (09:36 -0500)]
os/ObjectStore: add CollectionHandle wrappers for all read ops

The backend can optionally implement the handle-based variant. If
it does not, the wrappers will call the legacy coll_t version.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/ObjectStore: add CollectionHandle
Sage Weil [Mon, 18 Jan 2016 14:36:02 +0000 (09:36 -0500)]
os/ObjectStore: add CollectionHandle

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agolibrbd: block maintenance until after journal is ready 7382/head
Jason Dillaman [Wed, 27 Jan 2016 19:14:28 +0000 (14:14 -0500)]
librbd: block maintenance until after journal is ready

Ops were already blocked when the requests were received via
watch/notify.  Requests are now blocked for local requests as
well.

Fixes: #14510
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge branch 'wip-rgw-static-website-yehuda' 7381/head
Yehuda Sadeh [Wed, 27 Jan 2016 19:07:43 +0000 (11:07 -0800)]
Merge branch 'wip-rgw-static-website-yehuda'

Conflicts:
src/rgw/rgw_common.h
src/rgw/rgw_op.h
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h

9 years agoos/FuseStore: improve readdir for omap and attr 7134/head
Sage Weil [Fri, 15 Jan 2016 00:24:59 +0000 (19:24 -0500)]
os/FuseStore: improve readdir for omap and attr

Use new-style fuse readdir interface for omap and attr.  We aren't
particularly efficient, but we won't completely break if there are a
lot of attrs or omap entries.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: wait for commit and flush in all updates
Sage Weil [Fri, 15 Jan 2016 00:17:53 +0000 (19:17 -0500)]
os/FuseStore: wait for commit and flush in all updates

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: use offset for readdir
Sage Weil [Thu, 14 Jan 2016 16:32:15 +0000 (11:32 -0500)]
os/FuseStore: use offset for readdir

This allows us to list large directories.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoqa/workunits/objectstore/test_fuse.sh: simple workunit test
Sage Weil [Thu, 14 Jan 2016 13:45:38 +0000 (08:45 -0500)]
qa/workunits/objectstore/test_fuse.sh: simple workunit test

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: add 'type' file in root dir
Sage Weil [Thu, 7 Jan 2016 18:12:58 +0000 (13:12 -0500)]
os/FuseStore: add 'type' file in root dir

This also acts as a sentinel to indicate whether we have mounted.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/ObjectStore: add get_type()
Sage Weil [Thu, 7 Jan 2016 18:12:14 +0000 (13:12 -0500)]
os/ObjectStore: add get_type()

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph-objectstore-tool: drop filestore-specific sanity check
Sage Weil [Thu, 7 Jan 2016 18:04:52 +0000 (13:04 -0500)]
ceph-objectstore-tool: drop filestore-specific sanity check

Just let mount() fail

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph-objectstore-tool: add --op mkfs
Sage Weil [Thu, 7 Jan 2016 18:04:27 +0000 (13:04 -0500)]
ceph-objectstore-tool: add --op mkfs

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph-objectstore-tool: simplify error message
Sage Weil [Thu, 7 Jan 2016 18:04:09 +0000 (13:04 -0500)]
ceph-objectstore-tool: simplify error message

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph-objectstore-tool: 'whoami' is not required for an ObjectStore
Sage Weil [Thu, 7 Jan 2016 18:03:59 +0000 (13:03 -0500)]
ceph-objectstore-tool: 'whoami' is not required for an ObjectStore

OSD creates it, but it won't be there if we did --op mkfs

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: do not call exists() on an out-of-bounds oid
Sage Weil [Thu, 7 Jan 2016 17:51:03 +0000 (12:51 -0500)]
os/FuseStore: do not call exists() on an out-of-bounds oid

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: no-op chmod
Sage Weil [Thu, 7 Jan 2016 17:48:55 +0000 (12:48 -0500)]
os/FuseStore: no-op chmod

This makes mkdir(1) happy.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: allow object and collection creates
Sage Weil [Thu, 7 Jan 2016 17:39:54 +0000 (12:39 -0500)]
os/FuseStore: allow object and collection creates

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: more ENOENT on getattr for non-existent items
Sage Weil [Thu, 7 Jan 2016 15:47:28 +0000 (10:47 -0500)]
os/FuseStore: more ENOENT on getattr for non-existent items

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: hide bitwise_hash_end if bits unknown; add bitwise_hash_bits
Sage Weil [Thu, 7 Jan 2016 13:56:42 +0000 (08:56 -0500)]
os/FuseStore: hide bitwise_hash_end if bits unknown; add bitwise_hash_bits

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: present bitwise_hash_end
Sage Weil [Thu, 7 Jan 2016 02:34:42 +0000 (21:34 -0500)]
os/FuseStore: present bitwise_hash_end

Note this is the *last* hash value, inclusive.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: implement collection_bits
Sage Weil [Thu, 7 Jan 2016 02:34:18 +0000 (21:34 -0500)]
os/bluestore: implement collection_bits

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/ObjectStore: add collection_bits
Sage Weil [Thu, 7 Jan 2016 02:34:09 +0000 (21:34 -0500)]
os/ObjectStore: add collection_bits

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: respect fuse_debug
Sage Weil [Thu, 7 Jan 2016 02:16:13 +0000 (21:16 -0500)]
os/FuseStore: respect fuse_debug

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph-objectstore-tool: no need to check for fsck here
Sage Weil [Thu, 7 Jan 2016 01:57:01 +0000 (20:57 -0500)]
ceph-objectstore-tool: no need to check for fsck here

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph-objectstore-tool: use myexit(1) for fsck
Sage Weil [Thu, 7 Jan 2016 01:55:55 +0000 (20:55 -0500)]
ceph-objectstore-tool: use myexit(1) for fsck

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: osd_objectstore_fuse
Sage Weil [Wed, 6 Jan 2016 22:56:12 +0000 (17:56 -0500)]
osd: osd_objectstore_fuse

Expose underlying ObjectStore via fuse at $osd_data/fuse/.  Can be enabled/
disabled at runtime.

Signed-off-by: Sage Weil <sage@redhat.com>
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 agotools/rbd: fix error message typo 7369/head
Mauricio Garavaglia [Wed, 27 Jan 2016 03:48:33 +0000 (00:48 -0300)]
tools/rbd: fix error message typo

Signed-off-by: Mauricio Garavaglia <mauriciogaravaglia@gmail.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 agotest: add unitest test_pidfile.sh 7075/head
root [Thu, 14 Jan 2016 12:20:39 +0000 (20:20 +0800)]
test: add unitest test_pidfile.sh

Fixes: #13422
Signed-off-by: shun song <song.shun3@zte.com.cn>
9 years agoMon: When set pool crush rule should consider the pool size. 7341/head
songbaisen [Mon, 25 Jan 2016 06:17:50 +0000 (14:17 +0800)]
Mon: When set pool crush rule should consider the pool size.

Fixes: #14495
Signed-off-by: song baisen <song.baisen@zte.com.cn>
9 years agorbd: Add an argument-check for nbds_max in rbd-nbd 7337/head
Kongming [Sat, 23 Jan 2016 14:37:25 +0000 (22:37 +0800)]
rbd: Add an argument-check for nbds_max in rbd-nbd

Fixes: #14482
This modification adds several checks to the argument of nbds_max in the module of rbd-nbd. The value of nbds_max is strictly limited to non-negative integer now.

Signed-off-by: Kongming Wu <wu.kongming@h3c.com>
9 years agoBuild: Allow jemalloc enabled build with rocksdb-static 7368/head
Somnath Roy [Wed, 27 Jan 2016 00:05:40 +0000 (19:05 -0500)]
Build: Allow jemalloc enabled build with rocksdb-static

Presently, we can't do jemalloc enabled OSD build along with
rocksdb-static.Rocksdb is now mandatory with Bluestore and that's why
jemalloc builds are failing. Sometimes back the following commit
fd7a35731854528dde10deb3444a82ae4c1a9206 is introduced to build rocksdb
with jemalloc as well, so, we can allow jemalloc build along with
rocksdb-static now. Removing the redundant check from configure.ac.

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>