RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-03 15:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,453 Commits 219 Branches 396 Tags 1.7 GiB
3d263840f6
Commit Graph

48453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Durgin
3d263840f6 rbd-mirror: skeleton of a mirroring daemon 
This isn't functional yet, since ImageReplayer doesn't do any replay
yet.  Just the parts for monitoring other clusters for changes
(ClusterWatcher and PoolWatcher) are tested, with simple
unit and functional tests.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
 2016-02-03 23:44:53 -08:00
Loic Dachary
b04e17687f Merge pull request #6268 from dachary/wip-13453-recovery-counters 
recovery counters

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-02-04 11:16:35 +07:00
Samuel Just
4453b46205 Merge pull request #7507 from tchaikov/wip-cmake 
cmake: add KernelDevice.cc to libos_srcs

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-02-03 10:40:11 -08:00
Kefu Chai
82637be7e5 cmake: add KernelDevice.cc to libos_srcs 
which fixes the build

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-04 01:28:21 +08:00
Sage Weil
2aeadc9acf Merge remote-tracking branch 'gh/jewel' 2016-02-03 09:46:47 -05:00
Sage Weil
cc2ce6ad1a Merge branch 'wip-rados-bench' 2016-02-03 09:46:12 -05:00
Gu Zhongyan
669b932934 rados: Add units to rados bench output 
Fixes: #12248
Signed-off-by: Gu Zhongyan <guzhongyan@360.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-03 09:45:55 -05:00
Sage Weil
bf77308416 Merge pull request #7386 from liewegas/wip-features 
osd: skip redirect encoding if we can

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-03 09:44:28 -05:00
Sage Weil
e478a4f2a7 Merge branch 'weighted-priority-queue' of git://github.com/rldleblanc/ceph 
Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-02-03 08:53:22 -05:00
Sage Weil
9a80477432 Merge branch 'gelf-logging-backend' of git://github.com/irq0/ceph 
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-02-03 08:48:26 -05:00
Sage Weil
e85ffacb28 scripts/run-coverity: fix upload process 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-03 08:47:57 -05:00
Sage Weil
2e6db00dcb Merge pull request #7357 from zhengbinh3c/master 
osd: fix memory leak in ReplicatedPG.cc error path

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-03 08:52:02 -05:00
Sage Weil
178c52acf2 Merge pull request #7362 from xiexingguo/xxg-wip-fixbs 
osd: BlueStore: fix fsck and blockdevice read-relevant issue

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-03 08:50:46 -05:00
Sage Weil
680a999f42 Merge pull request #7468 from liewegas/wip-test-fuse 
qa/workunits/objectstore/test_fuse.sh: fix root check
 2016-02-03 08:49:37 -05:00
Sage Weil
6c9a35b22a Merge pull request #7476 from tchaikov/wip-include-expat-in-source 
rgw: do not include "expat.h" in header file

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-03 08:49:28 -05:00
Sage Weil
a76755c427 Merge pull request #7479 from roidayan/fix_xio_compilation 
msg/xio: fix compilation
 2016-02-03 08:48:54 -05:00
Sage Weil
06cecb4b90 ceph_test_objectstore: fix warning 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-02 11:08:09 -05:00
Sage Weil
9a349338f0 os/bluestore/KernelDevice: explicit on ctor 
This was lost in the wip-spdk merge.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-02 11:03:48 -05:00
Sage Weil
d3925a50e3 Merge pull request #7467 from liewegas/wip-scrub-start 
osd: fix scrub start hobject
 2016-02-02 11:03:14 -05:00
Sage Weil
87efba42fe Merge branch 'wip-spdk' of git://github.com/yuyuyu101/ceph 
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-02 11:02:12 -05:00
Sage Weil
dc50f31079 Merge remote-tracking branch 'me/wip-lockdep' 2016-02-02 11:00:37 -05:00
Sage Weil
75395c11e9 Merge pull request #7438 from ifed01/wip-pgbackend-cleanup 
osd: cleanup OSD/PGBackend interface a bit

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-02 11:03:51 -05:00
Jason Dillaman
482d1ca51d Merge pull request #7480 from trociny/fix-journal-commit_position_task 
journal: reset commit_position_task_ctx pointer after task complete

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-02 09:51:54 -05:00
Sage Weil
a682e77a73 script/run-coverity: fix user 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-02 09:01:28 -05:00
Mykola Golub
4f49c6bec9 journal: reset commit_position_task_ctx pointer after task complete 
Otherwise, schedule_commit_task() would never schedule the next task
and the commit position would not be committed until shutdown.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-02 15:43:57 +02:00
Sage Weil
aa5e8db78b Merge remote-tracking branch 'gh/wip-da-SCA-20150910' 
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-02-02 08:08:26 -05:00
Roi Dayan
122f4068d0 xio: fix compilation 
Signed-off-by: Roi Dayan <roid@mellanox.com>
 2016-02-02 13:50:47 +02:00
Orit Wasserman
73651d9e96 Merge pull request #7473 from yehudasa/wip-14516 
rgw-admin: document orphans commands in usage
 2016-02-02 10:10:38 +01:00
Kefu Chai
1650324f1a Merge pull request #7451 from wjin/fix 
msg/async: fix array boundary

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-02-02 14:56:12 +08:00
Kefu Chai
636b8f11f8 rgw: do not include "expat.h" in heade file 
Building Ceph without the Expat development library currently results in
the following build error:

~/ceph> ./configure --without-fuse --without-tcmalloc --without-radosgw
...
~/ceph> make
...
CXX ceph_dencoder-rgw_dencoder.o
In file included from rgw/rgw_dencoder.cc:6:0:
rgw/rgw_acl_s3.h:9:19: fatal error: expat.h: No such file or directory

The ceph-dencoder binary is built with rgw_dencoder.cc, which includes
rgw_acl_s3.h, which in turn includes expat.h. However, configure.ac
currently only checks for Expat as part of radosgw.

but we don't need expat.h for testing the encoding of rgw structs, so
move "#include <expat.h>" into the source file to avoid this dependency.
and as a side effect, this also speed up the compilation.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-02 14:26:51 +08:00
xie xingguo
f5f3282cff BlueStore: fix wrong action scope of enode 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-02 14:22:41 +08:00
Kefu Chai
2991e79f6e Merge pull request #7472 from badone/wip-ceph-disk-typo 
ceph-disk: Fix trivial typo

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-02-02 14:11:44 +08:00
xie xingguo
41ff579f5e BlueStore: add error handling for clone 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-02 14:04:17 +08:00
xie xingguo
e10490abc6 BlueStore: add error handling for clone_range 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-02 14:04:17 +08:00
xie xingguo
d1d6014d6f BlueStore: fix wrong decode logic of nid_max 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-02 14:04:17 +08:00
xie xingguo
2d52438622 BlueStore: fix unhandled return code from blockdevice APIs 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-02 14:04:17 +08:00
xie xingguo
9bc0c31613 BlueStore: try to scan as many errors as possible 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-02 14:04:17 +08:00
xie xingguo
3e61e3b0dd BlueStore: fix duplicated counting of errors 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-02 14:04:17 +08:00
xie xingguo
559a81b18b BlueStore: fix enode verification logic 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-02 14:04:17 +08:00
xie xingguo
10bd8addf6 BlueStore: add a guard for collection loading 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-02 14:04:17 +08:00
xie xingguo
f761113abe BlueStore: add a guard for overlay loading 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-02 14:04:17 +08:00
Kefu Chai
3b93bc4764 Merge pull request #6813 from manens/pybind_rados_snapshot_read 
pybind: Implementation of Ioctx.set_read to allow read from snapshots

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-02-02 11:26:47 +08:00
Yehuda Sadeh
105a76bf54 rgw-admin: document orphans commands in usage 
Fixes: #14516

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-01 16:33:55 -08:00
Brad Hubbard
820a7605fa ceph-disk: Fix trivial typo 
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
 2016-02-02 10:22:00 +10:00
Xinze Chi
3cf29729e4 msg: ignore request_redirect_t encode/decode when we not need 
Signed-off-by: Xinze Chi <xinze@xsky.com>
 2016-02-01 17:50:48 -05:00
Sage Weil
1179ddc2e3 Merge pull request #7445 from xiexingguo/xxg-wip-mem 
osd: memstore: fix blocksize for statfs

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-01 17:12:53 -05:00
Sage Weil
15ea140b3b qa/workunits/objectstore/test_fuse.sh: fix root check 
$EUID not defined everywhere.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-01 15:49:25 -05:00
Sage Weil
eb5db371c4 os/memstore: disable lockdep on Collection::lock 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-01 15:02:38 -05:00
Sage Weil
18d3a39aed os/kstore: disable lockdep on Collection::lock 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-01 15:02:37 -05:00
Sage Weil
fe649a34f6 os/bluestore: disable lockdep on Collection::lock 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-01 15:02:37 -05:00