RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-15 23:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,109 Commits 216 Branches 395 Tags 1.2 GiB
97639f665f
Commit Graph

48109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xie xingguo
97639f665f FuseStore: fix memory leak 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-01-29 10:26:14 +08:00
Josh Durgin
60d0df5c69 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>
 2016-01-28 09:05:00 -08:00
Kefu Chai
2d75c9d85b 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>
 2016-01-29 00:43:38 +08:00
Orit Wasserman
9f27053faf Merge pull request #7403 from rzarzynski/wip-rgw-dumpconlen-cosmetics 
rgw: cosmetic improvements in dump_content_length()
 2016-01-28 17:30:52 +01:00
Radoslaw Zarzynski
57db464ea8 rgw: cosmetic improvements in dump_content_length(). 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2016-01-28 17:19:56 +01:00
Kefu Chai
157bf3eb61 ceph-objectstore-tool: disable fuse support if !HAVE_LIBFUSE 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-01-28 23:36:45 +08:00
Kefu Chai
b2e5c55886 osd: disable FuseStore if !HAVE_LIBFUSE 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-01-28 23:36:45 +08:00
Kefu Chai
563206cc43 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>
 2016-01-28 23:36:45 +08:00
Kefu Chai
63d3d2bec7 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>
 2016-01-28 23:36:45 +08:00
Kefu Chai
fd8ab0bd07 cmake: remove the copyright of FindSnappy.cmake 
as we've basically removed all the HyperTable code.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-01-28 20:50:51 +08:00
Kefu Chai
5d91e6d398 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>
 2016-01-28 15:35:16 +08:00
x11562
38e2f7a8a2 rbd: simplify snap rename arguments 
Signed-off-by: Na Xie <xie.na@h3c.com>
 2016-01-28 08:55:01 +08:00
Josh Durgin
1e08b21f1b 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>
 2016-01-27 14:47:56 -08:00
Josh Durgin
22e0c8f5b3 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>
 2016-01-27 14:45:49 -08:00
Josh Durgin
f721fbb230 Merge pull request #7382 from dillaman/wip-14510 
librbd: block maintenance ops until after journal is ready

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-01-27 14:44:59 -08:00
Josh Durgin
22cecc435b Merge pull request #7259 from trociny/wip-14264 
librbd: API: async open and close

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-01-27 14:35:13 -08:00
Josh Durgin
8bb6c8c842 Merge pull request #7302 from dillaman/wip-14434 
librbd: journal shut down flush race condition

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-01-27 14:34:57 -08:00
Josh Durgin
c7e5848afc 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>
 2016-01-27 14:34:43 -08:00
Yehuda Sadeh
7e0a7a3d44 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>
 2016-01-27 12:36:35 -08:00
Mykola Golub
ab4b3732b1 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>
 2016-01-27 21:45:20 +02:00
Sage Weil
2e52a8b17c Merge pull request #7223 from liewegas/wip-collection-handles 
osd: collection handles

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-01-27 14:45:11 -05:00
Sage Weil
96a7c663b7 Merge pull request #7134 from liewegas/wip-fusestore 
osd: implement fuse interface for ObjectStore

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-01-27 14:39:21 -05:00
Sage Weil
17901f784f osd: use collection handle where possible 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:34:51 -05:00
Sage Weil
6560b14df9 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>
 2016-01-27 14:34:51 -05:00
Sage Weil
f3de2b87ad osd: associate a CollectionHandle with each PG 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:34:51 -05:00
Sage Weil
8e172a9875 os/memstore: implement handle-based read methods 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:34:51 -05:00
Sage Weil
34fe2e8a67 os/memstore: implement open_collection 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:34:51 -05:00
Sage Weil
765eb9f721 os/bluestore: implement CollectionHandle based read methods 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:34:50 -05:00
Sage Weil
e81e3c0889 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>
 2016-01-27 14:34:50 -05:00
Sage Weil
414d09bd85 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>
 2016-01-27 14:34:50 -05:00
Sage Weil
b6df3e1c96 os/ObjectStore: add CollectionHandle 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:34:50 -05:00
Jason Dillaman
2c353a854f 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>
 2016-01-27 14:14:28 -05:00
Yehuda Sadeh
bf9d1a067a 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
 2016-01-27 11:07:43 -08:00
Sage Weil
0613765a69 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>
 2016-01-27 14:06:15 -05:00
Sage Weil
a47f8ffb80 os/FuseStore: wait for commit and flush in all updates 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:14 -05:00
Sage Weil
f84384ac9a os/FuseStore: use offset for readdir 
This allows us to list large directories.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:14 -05:00
Sage Weil
c3954e69bb qa/workunits/objectstore/test_fuse.sh: simple workunit test 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:14 -05:00
Sage Weil
3e3606558c 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>
 2016-01-27 14:06:14 -05:00
Sage Weil
0638b11843 os/ObjectStore: add get_type() 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:14 -05:00
Sage Weil
e1a371db6e ceph-objectstore-tool: drop filestore-specific sanity check 
Just let mount() fail

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:14 -05:00
Sage Weil
c4f5a08627 ceph-objectstore-tool: add --op mkfs 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:14 -05:00
Sage Weil
0ed0ec52b4 ceph-objectstore-tool: simplify error message 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:14 -05:00
Sage Weil
614f1653ee 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>
 2016-01-27 14:06:14 -05:00
Sage Weil
b2a1c8614f os/FuseStore: do not call exists() on an out-of-bounds oid 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:14 -05:00
Sage Weil
ca4f077edd os/FuseStore: no-op chmod 
This makes mkdir(1) happy.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:14 -05:00
Sage Weil
53a333621a os/FuseStore: allow object and collection creates 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:13 -05:00
Sage Weil
57289de42b os/FuseStore: more ENOENT on getattr for non-existent items 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:13 -05:00
Sage Weil
2aa65322cd os/FuseStore: hide bitwise_hash_end if bits unknown; add bitwise_hash_bits 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:13 -05:00
Sage Weil
27bae894a6 os/FuseStore: present bitwise_hash_end 
Note this is the *last* hash value, inclusive.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:13 -05:00
Sage Weil
27dc220abd os/bluestore: implement collection_bits 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-01-27 14:06:13 -05:00