RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-08 17:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,660 Commits 219 Branches 396 Tags 1.3 GiB
f22b671434
Commit Graph

48660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
f22b671434 Merge remote-tracking branch 'gh/jewel' 2016-02-08 17:26:13 -05:00
Sage Weil
efc8134f66 v10.0.3 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-08 17:10:53 -05:00
Casey Bodley
4815a46615 Merge pull request #7572 from ceph/wip-cmake-2-8-16 
cmake: Added new unittests to make check
 2016-02-08 15:00:57 -05:00
Sage Weil
07dda1aaa3 Merge pull request #7574 from SUSE/wip-spec-license 
ceph.spec.in: add license declaration

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 13:43:38 -05:00
Nathan Cutler
db9408bfdf ceph.spec.in: add license declaration 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-02-08 18:57:31 +01:00
Ali Maredia
51a15726fc cmake: Added new unittests to make check 
Added unittest_shunique_lock & unittest_mutex_debug
to make check, and made them link ALLOC_LIBS

Signed-off-by: Ali Maredia <amaredia@redhat.com>
 2016-02-08 12:30:45 -05:00
Sage Weil
4235af3cf2 Merge pull request #7569 from SUSE/wip-copyright2 
ceph.spec.in: add copyright notice

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 10:48:07 -05:00
Nathan Cutler
23ec516b0d ceph.spec.in: add copyright notice 
http://tracker.ceph.com/issues/14694 Fixes: #14694

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-02-08 16:04:34 +01:00
Sage Weil
3f66231edf Merge pull request #7513 from athanatos/wip-ceph-test-rados-2 
ceph_test_rados: use less CPU
 2016-02-08 09:23:56 -05:00
Sage Weil
6a8cafe198 Merge pull request #5931 from ceph/wip-cxx11concurrency 
librados: move to c++11 concurrency types

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-02-08 09:23:15 -05:00
Sage Weil
7e44299618 Merge branch 'print-blocked-op' of git://github.com/majianpeng/ceph 
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 09:14:21 -05:00
Sage Weil
f17dbc65df Merge pull request #6608 from esnyder/wip-6634 
osd: remove unused SnapContext member snapc from MOSDSubOp message

Reviewed-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 09:17:49 -05:00
Sage Weil
658780730a Merge branch 'master' of git://github.com/joconcepts/ceph 
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 09:12:12 -05:00
Sage Weil
a981c1ecc2 Merge pull request #7181 from songbaisen/song5 
crush: reply quickly from get_immediate_parent

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-08 09:16:14 -05:00
Sage Weil
20228cb0a2 Merge pull request #7437 from Ved-vampir/wip_zlib_plugin 
common: add zlib compression plugin

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 09:15:04 -05:00
Sage Weil
34d33bcc5b Merge pull request #7527 from liewegas/wip-no-rgw-prestart 
systemd/ceph-radosgw-prestart.sh: remove

Reviewed-by: Nathan Cutler <ncutler@suse.com>
 2016-02-08 09:13:38 -05:00
Haomai Wang
90561b466d Merge pull request #7547 from yuyuyu101/wip-14679 
AsyncConnection: avoid debug log in cleanup_handler
 2016-02-08 14:15:37 +08:00
Kefu Chai
d21724a145 Merge pull request #7554 from tchaikov/wip-ceph-disk-test 
tests: ceph-disk.sh should compare with the resolved path

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-02-08 01:52:16 +08:00
Sage Weil
e604d681a4 Merge pull request #7551 from JevonQ/update-libcephfs-version 
libcephfs: update LIBCEPHFS_VERSION to indicate the interface was changed

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-07 09:01:04 -05:00
Kefu Chai
d267aaf8f3 tests: ceph-disk.sh should compare with the resolved path 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-07 04:39:24 -08:00
Jevon Qiao
4d3830225c libcephfs: Update LIBCEPHFS_VERSION to indicate the interface was changed 
Signed-off-by: Jevon Qiao <scaleqiao@gmail.com>
 2016-02-07 14:00:53 +08:00
Kefu Chai
7f854cc180 Merge pull request #7549 from tchaikov/wip-fix-ceph-disk-tests 
ceph-disk/test: fix test_prepare.py::TestPrepare tests

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-02-06 23:43:31 +08:00
Kefu Chai
08364c2ff7 ceph-disk/test: fix test_prepare.py::TestPrepare tests 
actually we are verifying if the variable is an instance of
specified class. for example, the `prepare.data` should be
a `PrepareFilestoreData` if `--bluestore` is not specified.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-06 06:27:30 -08:00
Haomai Wang
8569d38f98 AsyncConnection: avoid debug log in cleanup_handler 
local connection will be stop and call cleanup_handler after messenger
is down
introduced in
commit(9da2fffd31)

Fix #14679

Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-02-06 15:40:25 +08:00
Josh Durgin
0c6a724821 Merge pull request #7540 from dillaman/wip-librados-test-stub-unwatch 
librados_test_stub: protect against notify/unwatch race

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-02-05 17:41:03 -08:00
Josh Durgin
2b2ce9b909 Merge pull request #7529 from dillaman/wip-14412 
librbd: journal framework for tracking exclusive lock transitions

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-02-05 17:39:03 -08:00
Sage Weil
2e4fa4b3bd Merge pull request #7377 from liewegas/wip-datadir-search 
config: add $data_dir/config to config search path
 2016-02-05 20:03:50 -05:00
Sage Weil
f3a0157587 Merge pull request #7466 from adamemerson/wip-bsd-time-second-try 
common: time: have skewing-now call non-skewing now
 2016-02-05 20:03:35 -05:00
Sage Weil
220a473094 Merge pull request #7463 from dachary/wip-13422-pid-file 
global: do not start two daemons with a single pid-file (part 2)

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-02-05 20:03:00 -05:00
Sage Weil
c6ff94c21a Merge pull request #7460 from xiexingguo/xxg-wip-block 
osd: blockdevice: avoid implicit cast and add guard

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-05 20:02:34 -05:00
Sage Weil
5f99361070 Merge pull request #7530 from xiexingguo/xxg-wip-nid 
osd: bluestore: assign nid for newly created onode

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-05 20:02:07 -05:00
Sage Weil
3ac4d711d2 Merge pull request #7521 from liewegas/wip-memstore 
osd: memstore: set Collection::cid on create
 2016-02-05 20:01:47 -05:00
Sage Weil
86978957cb Merge pull request #7486 from ceph/wip-bluestore-oref 
osd: bluestore: fix two wal bugs; reuse OnodeRefs when applying txc

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-05 20:01:32 -05:00
Sage Weil
4dbd727f27 Merge pull request #7531 from jjhuo/master 
osd: bluestore: remove unused intrusive member hook in enode

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-05 20:01:05 -05:00
Sage Weil
caab2e1d15 Merge pull request #7535 from liewegas/wip-bluefs-mkfs 
osd: bluestore/BlueFS: initialize super block_size earlier in mkfs

Reviewed-by: Dan Mick <dmick@redhat.com>
 2016-02-05 20:00:31 -05:00
Sage Weil
7813776afd Merge pull request #7536 from liewegas/wip-bluestore-block 
osd: bluestore: fix block device file creation
 2016-02-05 20:00:07 -05:00
Ali Maredia
0594614781 Merge pull request #7541 from linuxbox2/cmake-feb5 
Cmake feb5
 2016-02-05 19:53:08 -05:00
Adam C. Emerson
f4b083a5e3 osdc: Update to use C++11 concurrency 
The only externally visible change is that Objecter::get_osdmap_read
and Objedcter::put_osdmap_read have been removed in favor of
Objecter::with_osdmap.

It can be used like:

objecter->with_osdmap([&](const OSDMap& o) { o.do_stuff(); };
int x = objecter->with_osdmap([&](const OSDMap& o) {
    return get_thing(id); });
objecter->with_osdmap(std::mem_fn(&OSDMap::do_stuff));
int x = objecter->with_osdmap(std::mem_fn(&OSDMap::get_thing),
                              id);

The choice between the style of the first two examples or the second two
is arbitrary and depends on what you prefer.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-02-05 17:07:28 -05:00
Matt Benjamin
21438a6773 cmake: add libboost_system to EXTRALIBS 
This concisely fixes several unittest builds, and reflects the
fact that this library dependency has moved into several areas
of the codebase (libcephfs, librbd, librgw).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-02-05 16:46:21 -05:00
Matt Benjamin
2669e0c280 cmake: don't try to install src/ceph-disk directory 
The proper cmake boilerplate to call ceph-disk/ceph-disk's
python installer is not present, FYI.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-02-05 16:46:16 -05:00
Matt Benjamin
33bc2ba55e cmake: don't add_test cephtool_test_osd twice 
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-02-05 16:46:13 -05:00
Jason Dillaman
38b9be2a99 librados_test_stub: protect against notify/unwatch race 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-05 16:14:39 -05:00
Adam C. Emerson
c1b3138f2e concurrency: Add shunique_lock 
Locker class tracking shared/unique/unlocked state of SharedMutex
concept.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2016-02-05 15:57:03 -05:00
Jason Dillaman
9418f055bd librbd: partial implementation of journal client / tag allocation 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-05 15:21:28 -05:00
Jason Dillaman
8443e50710 librbd: initial version of journal client and tag metadata 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-05 15:21:28 -05:00
Jason Dillaman
608947cb3f journal: added tag support methods 
librbd, for example, will allocate a new tag after acquiring
the exclusive lock.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-05 15:21:28 -05:00
Jason Dillaman
5eda2859d0 cls_journal: new get_client / client_update methods 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-05 15:21:28 -05:00
Jason Dillaman
3f29e7b89a cls_journal: client registration should hold opaque data structure 
The opaque structure will support journal client applications to
store and retrieve complex state.

Fixes: #13298

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-05 15:21:27 -05:00
Jason Dillaman
fa6d0ba964 cls_journal: new tag management methods and handling 
In the case of librbd, a new tag will be allocated when the
exclusive lock is acquired.  All tags for the same dataset
(e.g. librbd image) will belong to the same class.  Tags are
automatically pruned on tag create / client unregister
if no other clients' commit position would require the tags.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-05 15:21:26 -05:00
Jason Dillaman
243d91db68 journal: switched entry tags to use id instead of string 
Later commits will add the ability to allocate tags and
associate them with registered clients.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-05 13:03:57 -05:00