RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,520 Commits 216 Branches 395 Tags 1.4 GiB
d35fed9e95
Commit Graph

81520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yao Zongyou
cd926bce28 common: remove already included header files 
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
 2017-12-08 11:47:05 +08:00
Yao Zongyou
c8ea7d814b rgw: remove already included header files 
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
 2017-12-08 11:43:59 +08:00
Sage Weil
32f67852af
Merge pull request #19356 from tchaikov/wip-18589-mimic-dev1 
debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-12-07 21:19:26 -06:00
Vasu Kulkarni
e7883c1fb2 qa/tests: when no branch is specified, use wip branch under test for upgrade 
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
 2017-12-07 19:11:42 -08:00
Vasu Kulkarni
9430f352f4 qa/tests: Fix mapped_role attribute where it gets overwritten for subsequent calls. 
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
 2017-12-07 19:11:42 -08:00
Vasu Kulkarni
67ff2de694 qa/tests: update upgrade tests from jewel->luminous to jewel->luminous->master 
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
 2017-12-07 19:11:42 -08:00
Sage Weil
788d88a9ef
Merge pull request #18752 from liewegas/wip-peering-queue 
osd: put peering events in main sharded wq

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2017-12-07 19:43:16 -06:00
Willem Jan Withagen
beca358fb2 include: xlist: Fix Clang error for missing string 
Clang complains:
home/jenkins/workspace/ceph-master/src/include/xlist.h:210:13: error: invalid operands to binary exp
ression ('std::ostream' (aka 'basic_ostream<char>') and 'const char *')
        oss << ", ";
        ~~~ ^  ~~~~
1 error generated.

include ostream to fix Clang error

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2017-12-08 00:28:33 +01:00
Mykola Golub
9ca3f46b96 librbd: deep_copy: move set_head to snapshot_copy state machine 
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
 2017-12-08 00:17:16 +02:00
Mykola Golub
644c319181 librbd: deep_copy: don't create snapshots above snap_id_end 
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
 2017-12-08 00:16:58 +02:00
Adam C. Emerson
f6173b6a9c os/bluestore: Call get_str_map under with_val 
Another heap allocation bites the dust.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:12 -05:00
Adam C. Emerson
f26851b6d4 os/bluestore: Do not copy a string just to find its length 
I really dislike whoever decided to disallow taking the address of
member functions in the standard library.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
7344796570 msg: Use with_val, don't copy a string just to call find 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
777edc181d mon: Call get_json_str_map under wth_val 
To avoid temporary heap allocations.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
8dafb23516 mgr: Call _list_modules under with_val 
Avoid a temporary heap allocation.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
d65b89e839 kv/RocksDB: Do comparisons under with_val 
Rather than making a copy on the heap just to compare it.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
e4ec116abb kv/RocksDB: Use for_each_substr under with_val 
Minimize the number of copies we make.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
472491b9bd common: Add with_val to md_config_t 
Since passing back references that persist after we drop a lock is
unsafe, allow functions to be called on a reference under the lock.

This way we can compare strings or otherwise examine them without
needing to make a copy.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:07 -05:00
Adam C. Emerson
f14d90254b rgw: Disambiguate call to max 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:06 -05:00
Alfredo Deza
c0dd4a8314 ceph-volume test logging ignored ceph.conf file 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 15:03:52 -05:00
Alfredo Deza
c1d2bd52c0 ceph-volume main warn on inability to load ceph.conf, don't raise 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 15:03:45 -05:00
Alfredo Deza
38c3547a1b ceph-volume tests.api ensure that we can handle non-ceph tags in lvs 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 14:55:17 -05:00
Alfredo Deza
9306504f0a ceph-volume api.lvm only consider 'ceph.' tags in logical volumes 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 14:55:12 -05:00
Alfredo Deza
e1b77cf714 ceph-volume configuration allow inlined comments for # and ; 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 14:45:39 -05:00
Alfredo Deza
d72b8a91c0 ceph-volume tests verify that INI comments can be inlined 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 14:45:39 -05:00
Alfredo Deza
fc5ed0cae1 ceph-volume lvm.create rollback osd creation when prepare or activate fails 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 07be6fe0ab)
 2017-12-07 14:41:05 -05:00
Alfredo Deza
e03a967b78 ceph-volume lvm.create fallback to bluestore when objectstore is not specified 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 6781d6498e)
 2017-12-07 14:41:05 -05:00
Alfredo Deza
b50912204d ceph-volume lvm.prepare fallback to bluestore when objectstore is not specified 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9b17ad2f8f)
 2017-12-07 14:41:05 -05:00
Alfredo Deza
5704b5053e ceph-volume lvm.prepare rollback osd when prepare fails and an osd id was generated 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 579d12806b)
 2017-12-07 14:41:05 -05:00
Alfredo Deza
f0b407bf47 ceph-volume lvm.common create a rollback_osd utility to cleanup failed osd prepare/create calls 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e533792e0d)
 2017-12-07 14:41:05 -05:00
vasukulkarni
8a6434c20e
Merge pull request #19244 from ceph/wip-cd-volume 
qa/tasks: update ceph-deploy task to use newer ceph-volume syntax
 2017-12-07 10:54:47 -08:00
Kefu Chai
4bc6269f15
Merge pull request #19276 from tchaikov/wip-volume-key 
ceph-volume: do not use --key during mkfs

Reviewed-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 23:31:10 +08:00
Alfredo Deza
3b9fade2b8
Merge pull request #19363 from ceph/wip-rm22282 
ceph-volume: removed the explicit use of sudo

Reviewed-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 09:38:20 -05:00
Rishabh Dave
39cd6f993f doc/man: mention "ls" in the ceph osd's subcommands list 
Though "ls" command is explained and it's usage shown in the man page,
it is not mentioned in the subcommands list of "ceph osd" in the
beginning.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
 2017-12-07 20:04:19 +05:30
Alfredo Deza
09f88ce543
Merge pull request #19381 from ceph/fix_cephvol_doc 
ceph-volume/doc: add missing subcommand in examples

Reviewed-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 08:45:52 -05:00
Guillaume Abrioux
a284f164f3 doc: add missing subcommand in examples 
Add the missing 'lvm' subcommand in examples in the documentation of
ceph-volume.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
 2017-12-07 14:12:48 +01:00
Venky Shankar
dbf08e5177 rbd-mirror: persist image mapping timestamp on map update 
Signed-off-by: Venky Shankar <vshankar@redhat.com>
 2017-12-07 04:55:56 -05:00
Venky Shankar
c3ae008994 rbd-mirror: include map timestamp in image map 
Signed-off-by: Venky Shankar <vshankar@redhat.com>
 2017-12-07 04:55:56 -05:00
Jos Collin
1aa2e7c677 client: drop duplicate friend 
Dropped duplicate friend access providing, as the below warning appears:
ceph/src/client/Client.h:764:16: warning: ‘C_Client_Remount’ is already a friend of ‘Client’ [enabled by default]
   friend class C_Client_Remount;

Signed-off-by: Jos Collin <jcollin@redhat.com>
 2017-12-07 13:26:44 +05:30
Yan, Zheng
fd041a1920 client: update Dir::num_null_dentries in Dentry::{link,unlink} 
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2017-12-07 14:52:33 +08:00
Yan, Zheng
99b1b959e1 client: drop null child dentries before try pruning inode's alias 
Null child dentries holds reference on inode's alias, they prevents
Client::trim_caps() from trimming the inode. Null dentries are trimmed
by Client::trim_cache() according to 'client_cache_size' config option.
So Client::trim_caps() may fail to trim as many caps as MDS asked when
client cache size is smaller than the config limit.

Fixes: http://tracker.ceph.com/issues/22293
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2017-12-07 13:26:12 +08:00
Sage Weil
f3b2eb9d2d
Merge pull request #18276 from liewegas/wip-removed-snaps 
mon,osd,osdc: refactor snap trimming (phase 1)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2017-12-06 21:33:08 -06:00
Josh Durgin
d10aad6be8
Merge pull request #19364 from neha-ojha/wip-preserve-cbt 
qa: preserve cbt task results

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-12-06 19:30:15 -08:00
David Zafman
a8b8d541dd ceph-objectstore-tool: Add option "dump-import" to examine an export 
Fixes: http://tracker.ceph.com/issues/22086

Signed-off-by: David Zafman <dzafman@redhat.com>
 2017-12-06 17:30:47 -08:00
Sage Weil
a569052054 osd/SnapMapper: more debug around errors 
Hunting http://tracker.ceph.com/issues/21557

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-12-06 18:10:39 -06:00
Sage Weil
ba08c2edff os/bluestore: be more verbose about omap 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-12-06 18:09:54 -06:00
Sage Weil
aafb3a565d qa/tasks/ceph_manager: tolerate tell osd.* error 
It's possible for tell osd.* to race against an osd we stopped but the
cluster doesn't know is down yet.  In tha case we'll get ENXIO on that
osd and the command will fail.

In this context, we don't care.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-12-06 17:51:20 -06:00
Neha Ojha
46dee4b102 qa: preserve cbt task results 
Signed-off-by: Neha Ojha <nojha@redhat.com>
 2017-12-06 13:23:44 -08:00
Jason Dillaman
1d0238fb63
Merge pull request #19188 from adamwg/awg/rbd-watchers-api 
librbd: Add a function to list image watchers

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-12-06 15:20:13 -05:00
Jason Dillaman
f62a661c08
Merge pull request #19337 from trociny/wip-22306 
pybind/rbd: fix metadata functions error handling

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-12-06 15:19:27 -05:00