Commit Graph

45716 Commits

Author SHA1 Message Date
Sage Weil
17c002a06d Merge pull request #6407 from renhwztetecs/renhw-wip-13627
mon: initialize recorded election epoch properly even when standalone

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-11 09:15:51 -05:00
Sage Weil
88fe7810a8 Merge pull request #6385 from Vicente-Cheng/mkfs-does-not-decode-an-existing-superblock
osd: fix reactivate (check OSDSuperblock in mkfs() when we already have the superblock)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-11 09:14:01 -05:00
Sage Weil
7dc1669114 Merge pull request #6373 from liewegas/wip-promoteon2ndread-ec
librados: fix PromoteOn2ndRead test for EC

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-11 09:12:31 -05:00
Jason Dillaman
bddb125956 Merge pull request #6520 from trociny/fix-rbd-apply_changes
rbd: make config changes actually apply

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-11 09:10:44 -05:00
Sage Weil
c8e47d11b6 Merge pull request #6347 from xiexingguo/xxg-wip-13566
osd: fixes for several cases where op result code was not checked or set

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-11 09:07:15 -05:00
Sage Weil
dde76ae9e3 Merge pull request #5168 from majianpeng/dynamic-control-optracker
common: allow enable/disable of optracker at runtime

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-11 09:02:26 -05:00
Kefu Chai
9c1a4ed617 Merge pull request #6089 from SUSE/wip-init-ceph-getopt
init-ceph: use getopt to make option processing more flexible

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-11 22:00:44 +08:00
Nathan Cutler
a6d354c622 src/init-ceph.in: remove unused variables
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-11-11 14:10:19 +01:00
Nathan Cutler
d4c0969714 src/init-ceph.in: improve usage message
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-11-11 14:10:19 +01:00
Nathan Cutler
c994c0a9c4 src/init-ceph.in: process command-line options using getopt
http://tracker.ceph.com/issues/3015 Fixes: #3015

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-11-11 14:10:14 +01:00
Josh Durgin
f661a559aa Merge pull request #6516 from trociny/wip-13719
librbd: perf section name: use hyphen to separate components

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-10 23:55:37 -08:00
Mykola Golub
3f749b7a62 rbd: make config changes actually apply
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-11 09:38:49 +02:00
Mykola Golub
595c1e5650 tests: rbd/admin_socket: use xmlstarlet when parsing perf dump
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-11 09:19:47 +02:00
Mykola Golub
fbe5526d09 librbd: perf section name: use hyphen to separate components
"/" and "@" characters make invalid xml format output.

Fixes: #13719
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-11 09:19:47 +02:00
Vikhyat Umrao
b30d1b8d00 doc: Adding --cluster option to rbd man page.
Fixes #13457
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-10 22:05:59 -08:00
Loic Dachary
50504c90e7 Merge pull request #6519 from kylinstorage/wip-revise-organization
revise organization

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-11 07:05:12 +01:00
Josh Durgin
426450472a Merge branch 'wip-11286' of https://github.com/dillaman/ceph
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-10 21:19:37 -08:00
Josh Durgin
d46d4a98b6 Merge pull request #5987 from dillaman/wip-rbd-refactor
rbd: refactor cli command handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-10 21:18:04 -08:00
Jason Dillaman
6daa1ebc21 tests: updated rbd CLI --image-feature optional
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-10 13:55:39 -05:00
Sage Weil
c12f7d235d ceph_test_rados_api_tier: fix PromoteOn2ndRead for EC case
The ec and non-ec cases are copy&pasted code.  Yuck.  This duplicates the
non-ec fix from 347ac0f8.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-10 13:42:34 -05:00
Jason Dillaman
1be02b1d87 rbd: corrected handling of '--image-feature' optional
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-10 13:21:11 -05:00
Kefu Chai
7481f43e39 Merge pull request #6488 from xiexingguo/xxg-wip-rados-cleanup
librados: do cleanup

Reviewed-by: Sebastien Ponce <sebastien.ponce@cern.ch>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-11 00:56:40 +08:00
Josh Durgin
b54719b01c Merge pull request #6523 from dillaman/wip-13740
librbd: perf counters might not be initialized on error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-10 08:32:40 -08:00
Jason Dillaman
dd5a263b83 librbd: perf counters might not be initialized on error
Fixes: #13740
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-10 08:20:13 -05:00
Jason Dillaman
08b4c294b7 PendingReleaseNotes: document updated rbd CLI options
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-10 07:59:03 -05:00
Loic Dachary
cd71c1a414 Merge pull request #6522 from branch-predictor/bp-temporary-mon-fix
mon: revert MonitorDBStore's WholeStoreIteratorImpl::get

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-10 12:54:55 +01:00
Piotr Dałek
d548b5fbb4 mon: revert MonitorDBStore's WholeStoreIteratorImpl::get
Revert MonitorDBStore's WholeStoreIteratorImpl::get method to state
before commit 66b7b920cf until better,
long-term solution for #13742 will be provided.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-11-10 12:50:55 +01:00
Li Wang
f01892807f revise organization
Signed-off-by: Li Wang <li.wang@kylin-cloud.com>
2015-11-10 17:24:12 +08:00
Josh Durgin
15f8ea00e4 Merge pull request #6394 from dillaman/wip-13560
krbd: remove deprecated --quiet param from udevadm

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-09 23:30:42 -08:00
Josh Durgin
220ed185f3 Merge pull request #6447 from dillaman/wip-13674
librbd: resize should only update image size within header

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-09 23:27:08 -08:00
xiexingguo
f7f5a08051 internal: remove unused local variables
Remove unused variables bl and bl2 in snap_list and ictx_refresh.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-11-10 07:29:54 +08:00
xiexingguo
c8fe5ae357 librados: cast oid to object explicitly before call ioctx methods
Cast oid to object explicitly before call ioctx methods.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-11-10 07:27:40 +08:00
Yehuda Sadeh
866d0a0892 Merge pull request #6513 from ceph/revert-6419-wip-openssl
Revert 0374bb4a2f
2015-11-09 15:26:12 -08:00
xiexingguo
e986ade817 IoCtxImpl: remove unused variable sName
remove unused local variable sName in rollback.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-11-10 07:26:03 +08:00
Yehuda Sadeh
a5651b867a Revert 0374bb4a2f 2015-11-09 15:24:29 -08:00
Yehuda Sadeh
0374bb4a2f Merge pull request #6419 from ceph/wip-openssl
rgw: link against system openssl (instead of dlopen at runtime)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-09 13:56:29 -08:00
Jason Dillaman
d93a7951d7 Merge pull request #6453 from trociny/wip-2468
librbd: flush and invalidate cache via admin socket

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-09 16:36:58 -05:00
Sage Weil
62f122d4ab Merge pull request #6511 from liewegas/wip-fix-kv
kv: fix bug in kv key optimization

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-11-09 14:30:14 -05:00
Yehuda Sadeh
f5ac4a0c23 Merge branch 'wip-12955' 2015-11-09 11:03:40 -08:00
brian
7496741ebb rgw: fix modification to index attrs when setting acls
Fixes: #12955

 - add ACL change after initial population
 - populate bufferlist with object attributes

Signed-off-by: Brian Felton <bjfelton@gmail.com>
2015-11-09 11:03:02 -08:00
Sage Weil
9689fe0ae0 kv: fix string ctor usage
When constructing a string from a char* there is only a single
length argument, no offset.  The 3 argument variant we were using
was converting to a std::string first (an prematurely terminating
on \0).

Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-09 13:40:41 -05:00
Yehuda Sadeh
754e37a952 Merge pull request #6047 from Sandy4999/wip-13140
rgw: fix swift API returning incorrect account metadata

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-09 10:38:46 -08:00
Josh Durgin
c26ec99ce5 Merge pull request #6504 from dillaman/wip-13727
tests: fix typo in TestClsRbd.snapshots test case

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-09 10:19:09 -08:00
Mykola Golub
d33842d237 tests: librbd: admin socket commands to flush and invalidate cache
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-09 16:14:11 +02:00
Mykola Golub
0996f9dfce librbd: flush and invalidate cache via admin socket
Fixes: #2468
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-09 16:14:11 +02:00
Mykola Golub
39503f5841 librbd: perf counter for cache invalidates
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-09 16:14:11 +02:00
Sage Weil
6ab35330e6 Merge pull request #6312 from liewegas/wip-kv
kv: optimize and clean up internal key/value interface

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-11-09 09:10:37 -05:00
Jason Dillaman
3b39226709 tests: fix typo in TestClsRbd.snapshots test case
Fixes: #13727
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-09 09:06:05 -05:00
Sage Weil
b5332742ad Merge pull request #6300 from XinzeChi/wip-throttle-max
common: fix reset max in Throttle using perf reset command

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-09 09:04:25 -05:00
Sage Weil
d74de14f7c Merge pull request #6364 from dillaman/wip-13491
osd: fix broken balance / localized read handling

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-09 09:03:41 -05:00