RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,752 Commits 211 Branches 394 Tags 2 GiB
773713b078
Commit Graph

45752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Durgin
773713b078 Merge branch 'wip-13504' of https://github.com/trociny/ceph 
rbd: API: options on image create

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Conflicts:
	src/test/librbd/test_librbd.cc (trivial, two tests added at end of file)
 2015-11-12 14:08:31 -08:00
Mykola Golub
102539e176 librbd: API: options on image create: update tests 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-11-12 21:43:49 +02:00
Mykola Golub
c3be44ed8f librbd: API: options on image create 
Pass options as key/value configuration pairs on image create instead
of expanding rbd_create/rbd_clone/rbd_copy for every possible
configuration override.

Fixes: #13504
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-11-12 21:43:49 +02:00
Jason Dillaman
035ea29df2 Merge pull request #6557 from ceph/wip-rbd-cmake-fixes 
cmake: librbd and libjournal build fixes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2015-11-12 13:32:31 -05:00
Casey Bodley
3ccc3aff4d Merge pull request #6556 from athanatos/wip-cmake-nss 
cmake: add nss as a suffix for pk11pub.h
 2015-11-12 12:34:08 -05:00
Samuel Just
40522828c1 cmake: add nss as a suffix for pk11pub.h 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-11-12 09:12:17 -08:00
Ilya Dryomov
0e5a794eac librbd: provide an out-of-class definition for MAX_DESCRIPTION_OFFSET 
std::min() takes its parameters by reference, so provide a definition
for OptionPrinter::MAX_DESCRIPTION_OFFSET constant.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
 2015-11-12 17:59:19 +01:00
Ilya Dryomov
6c5d601b65 cmake: fix librbd and add src/journal 
librbd was missing a recently added file, src/journal was missing
entirely - this brings the build back.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
 2015-11-12 17:59:19 +01:00
Sage Weil
0ee9fdced4 Merge pull request #6517 from kylinstorage/wip-trivial-bug 
osd: fix bug in last_* PG state timestamps

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-11-12 08:40:42 -05:00
Jason Dillaman
085d8bed57 Merge pull request #6552 from trociny/wip-journal 
journal: incremental improvements and fixes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2015-11-12 08:21:21 -05:00
Loic Dachary
0ce234b8fe Merge pull request #6462 from javacruft/wip/ec-modules 
Build internal plugins and classes as modules

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-11-12 12:35:20 +01:00
Mykola Golub
d911641ccb journal: update allocated tid when skipping committed entry in player 
Otherwise, if on image open, there are no any uncommitted entries in
journal, allocated tid is not updated to the latest commited and
recording always starts from tid=0.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-11-12 13:33:44 +02:00
Kefu Chai
b6f223b511 Merge pull request #6539 from yehudasa/wip-cmake-fix 
cmake: fix files list

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-11-12 11:53:34 +08:00
Josh Durgin
5385883ead Merge pull request #6316 from dillaman/wip-13494 
rbd: dynamically generated bash completion

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-11-11 11:54:56 -08:00
Josh Durgin
0ce0bc1552 Merge remote-tracking branch 'origin/jewel' 2015-11-11 11:51:49 -08:00
Yehuda Sadeh
3ea903e773 cmake: fix files list 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-11-11 08:38:05 -08:00
Mykola Golub
a1b690d9d3 cls::journal: fixup: constify dump functions 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-11-11 17:04:33 +02:00
Mykola Golub
0b261e2f83 journal: call metadata shutdown on journal remove 
This fixes error observed when disabling journal:

  JournalMetadata: journal watch error: (107) Transport endpoint is not connected

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-11-11 17:04:11 +02:00
Mykola Golub
0dd6e0fd28 journal: don't use object_number when comparing positions 
Only tid does matter.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-11-11 17:03:51 +02:00
Mykola Golub
b9c6ae8794 journal: make commit and flush params configurable 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-11-11 17:00:02 +02:00
Mykola Golub
13bc7beb04 journal: allow alternate pool for journal objects 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-11-11 16:44:08 +02:00
Mykola Golub
d4a14e0b4d journal: output operators for journal types 
They are going to be used for diagnostic.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-11-11 16:43:56 +02:00
Sage Weil
384d10db56 Merge pull request #6471 from mslovy/wip-check-reply-guard-again 
osd: avoid double-check for replaying and can_checkpoint() in FileStore::_check_replay_guard

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-11-11 09:23:39 -05:00
Sage Weil
33c158958b Merge pull request #6426 from xiexingguo/xxg-wip-13642 
librados: fix rare race where pool op callback may hang forever

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-11-11 09:16:58 -05:00
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
Mykola Golub
ff8b06fefb rbd: RBD::clone2: fix tracepoint 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-11-11 10:45:44 +02: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
3ab1668c6a Merge pull request #6525 from dillaman/wip-13636-jewel 
WorkQueue: new PointerWQ base class for ContextWQ

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-11-10 21:43:52 -08: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
9ebea48cd9 rbd: dynamically generated bash completion 
The rbd CLI bash completion is now dynamically generated by extracting
the available commands and command options from the CLI application.

Fixes: #13494
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-11-10 21:05:54 -05:00
Jason Dillaman
01c720b1b3 rbd: hidden 'bash-completion' command dumps all available commands 
It also extracts all available options for a given command for use
which can be used by an improved bash completion script.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-11-10 21:05:54 -05: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