RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 17:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,458 Commits 212 Branches 394 Tags 1.6 GiB
bb82a9c504
Commit Graph

72458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
c94645567b Merge pull request #14873 from liewegas/wip-bluefs-position 
os/bluestore: put bluefs in the middle of the shared device

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
 2017-05-17 10:29:52 -05:00
Sage Weil
55c47ef6e1 Merge pull request #14902 from liewegas/wip-upmap 
osd/OSDMap: improve upmap calculation

Reviewed-by: Loic Dachary <loic@dachary.org>
 2017-05-17 10:29:28 -05:00
Sage Weil
35834a308e Merge pull request #14933 from liewegas/wip-asok-schema 
common/perf_counters: make schema more friendly and update docs

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
 2017-05-17 10:29:09 -05:00
Sage Weil
16cce5a56b Merge pull request #14967 from tchaikov/wip-faster-cull 
mgr: optimize DaemonStateIndex::cull() a little bit

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-05-17 10:28:49 -05:00
Sage Weil
81bd3025d1 Merge pull request #15002 from dachary/wip-19836-crush-pre-luminous 
crush: encode can override weights with weight set

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-17 10:26:06 -05:00
Sage Weil
9a06fdbffe Merge pull request #15031 from tchaikov/wip-drop-unused-opts 
config_opts: drop unused opts

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-17 10:25:25 -05:00
Sage Weil
570f576468 Merge pull request #15043 from tchaikov/wip-19884 
ceph-detect-init: detect init system by poking the system

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2017-05-17 10:24:50 -05:00
Sage Weil
0260a52631 Merge pull request #15059 from liewegas/wip-mon-kvtype 
mon: fix mon_keyvaluedb application

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-17 10:24:19 -05:00
runsisi
6d991c5c51 rbd: remove unnecessary -ENOENT check for rbd cli 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2017-05-17 23:14:21 +08:00
runsisi
3e3bb7b0fc librbd: translate error -ENOENT to 0 for list APIs 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2017-05-17 23:14:15 +08:00
John Wilkins
3b943b49e8 Merge pull request #15032 from tchaikov/wip-doc-opts 
doc: add descriptions for mon/mgr options

Reviewed-by: John Wilkins <jowilkin@redhat.com>
 2017-05-17 08:04:29 -07:00
Abhishek Lekshmanan
9db24d5577 rgw: drop expat header in a couple of files 
Since it is already a part of rgw_xml
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2017-05-17 16:16:36 +02:00
Abhishek Lekshmanan
b4a4416e1f rgw: drop using namespace std in header files 
We're still having the include in include/type.h, so just sweeping
things under the rug for now

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2017-05-17 16:13:54 +02:00
Sage Weil
73da4e199a os/bluestore/KernelDevice: helpful warning when aio limit exhausted 
Suggested-by: Dan Van Der Ster <daniel.vanderster@cern.ch>
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-17 09:38:51 -04:00
runsisi
a1328cdeb9 pybind/rbd: fix crash if more than 1024 images in trash bin 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2017-05-17 21:03:02 +08:00
John Spray
618b9b3f3f Merge pull request #15127 from tchaikov/wip-vstart-mgr-debug-ms 
vstart: "debug_ms=1" for mgr by default

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-05-17 12:18:15 +01:00
Kefu Chai
fab6fc15e1 Merge pull request #15103 from drunkard/master 
doc: minor fixes in radosgw/

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-17 17:00:56 +08:00
Kefu Chai
ae8eee2fde Merge pull request #15080 from hikycool/master 
doc: update the usage of 'ceph-deploy purge'

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-17 16:54:42 +08:00
Casey Bodley
4b338ce9bd doc/rgw: remove fastcgi page and sample configs 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2017-05-16 22:36:53 -04:00
Kefu Chai
a6daa84d1a vstart: "debug_ms=1" for mgr by default 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-17 10:31:46 +08:00
Jos Collin
5bc0e3448a common: Remove redundant includes 
Fixes: http://tracker.ceph.com/issues/19883 (Partially)

Signed-off-by: Jos Collin <jcollin@redhat.com>
 2017-05-17 06:49:19 +05:30
Casey Bodley
a21d411c9c osd: fix argument-dependent lookup of swap() 
because include/types.h has a 'using namespace std', the call to
::swap() had previously been selecting overloads from namespace std. but
once any other swap() functions are present in the global namespace,
argument-dependent lookup [1] will not consider those from std

for example, when common/sstring.hh has been included, its global swap()
function is the only overload considered, so calls to ::swap() result in
errors like this:

/home/cbodley/ceph/src/osd/osd_types.h: In member function ‘void ObjectModDesc::swap(ObjectModDesc&)’:
/home/cbodley/ceph/src/osd/osd_types.h:3135:56: error: no matching function for call to ‘swap(bool&, bool&)’
     ::swap(other.can_local_rollback, can_local_rollback);
                                                        ^
/home/cbodley/ceph/src/common/sstring.hh:589:6: note: candidate: template<class char_type, class size_type, size_type max_size> void swap(basic_sstring<char_type, size_type, Max>&, basic_sstring<char_type, size_type, Max>&)
 void swap(basic_sstring<char_type, size_type, max_size>& x,
      ^
/home/cbodley/ceph/src/common/sstring.hh:589:6: note:   template argument deduction/substitution failed:
/home/cbodley/ceph/src/osd/osd_types.h:3135:56: note:   mismatched types ‘basic_sstring<char_type, size_type, Max>’ and ‘bool’
     ::swap(other.can_local_rollback, can_local_rollback);

adding a `using std::swap;` to the calling scope and removing :: from
the call to `swap()` allows argument-dependent lookup to resolve the
overloads in both namespaces

[1] http://en.cppreference.com/w/cpp/language/adl

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2017-05-16 18:47:04 -04:00
Patrick Donnelly
6c34a2c673
qa: silence upgrade test failure 
The new fs setting standby_count_wanted is only avialable in luminous. Upgrade
tests were tripping on this.

Fixes: http://tracker.ceph.com/issues/19934

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2017-05-16 18:43:57 -04:00
Sage Weil
9da6843166 osd/PGLog: avoid pinning large buffers with ObjectModDesc 
Accidentally removed by 5e0ec06376f832d32a6b1af390f925a59b03798f.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-16 17:33:54 -04:00
Sage Weil
234a989de4 osd: encode snaps more efficiently 
1- encode into a sized buffer.
2- do not needlessly copy the set<> to a vector<> before encoding.
set<> and vector<> encode identically.  Since we are converting from sorted
set<> to unsorted vector<>, the order doesn't change either.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-16 17:33:48 -04:00
Neha Ojha
6ecb03299a mon: add test for crush type down health warnings 
Signed-off-by: Neha Ojha <nojha@redhat.com>
 2017-05-16 14:16:19 -07:00
J. Eric Ivancich
2f96956b7d osd/pglog: Remove loop through empty collection. 
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
 2017-05-16 16:35:47 -04:00
Yuri Weinstein
26df056e34 Merge pull request #15087 from liewegas/wip-thrash-ec 
qa/suites/rados: fix ec thrashing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-05-16 13:20:34 -07:00
Yuri Weinstein
07ac91d4b9 Merge pull request #15072 from liewegas/wip-crush-swap-bucket 
mon,crush: add 'osd crush swap-bucket' command

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-16 13:19:59 -07:00
Yuri Weinstein
9187156b55 Merge pull request #15069 from tchaikov/wip-inttypes-cleanup 
int_types.h: remove hacks to workaround old systems

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
 2017-05-16 13:18:23 -07:00
Yuri Weinstein
98827f4490 Merge pull request #15057 from liewegas/wip-osd-choose-cleanup 
osd/PG: drop pre-firefly compat_mode for choose_*_acting

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
 2017-05-16 13:17:37 -07:00
Yuri Weinstein
a49d9c5637 Merge pull request #15042 from badone/wip-redundant-headers-3 
common: Remove redundant includes

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-16 13:16:43 -07:00
Yuri Weinstein
0e03291cf6 Merge pull request #14989 from liewegas/wip-19877 
osd: fix past_intervals base case by adding epoch_pool_created to pg_history_t

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-05-16 13:13:36 -07:00
Sage Weil
b540b4299d mon/OSDMonitor: introduce debug option to allow filestore for ec overwrites 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-16 15:39:46 -04:00
Jason Dillaman
38ba53d076 Merge pull request #15113 from trociny/wip-unittest_librbd-cleanup 
test/librbd: unit tests cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-05-16 14:05:38 -04:00
Mykola Golub
dbde7af146 Merge pull request #15093 from dillaman/wip-19929 
librbd: reacquire lock should update lock owner client id

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2017-05-16 19:40:38 +03:00
Sage Weil
e57ecb64f0 qa/suites/rados/thrash: make sure osds have map before legacy scrub 
The OSDs must have a map reflecting the require_luminous flag in order
for the legacy conversion to happen.  A quick rados bench should ensure
that.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-16 12:28:40 -04:00
Casey Bodley
978f1d3abb Merge pull request #10690 from ceph/wip-rgw-polymorphic-errors 
rgw: polymorphic error codes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-05-16 11:54:27 -04:00
John Spray
60f904615f Merge pull request #15096 from jcsp/wip-journalrepair-test 
qa: simplify TestJournalRepair

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2017-05-16 16:11:57 +01:00
Sage Weil
225bc60092 Merge pull request #15110 from tchaikov/wip-build-using-cmake 
doc: use do_cmake.sh instead of `cmake ..`

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-16 09:20:50 -05:00
Kefu Chai
e7d1d877dd Merge pull request #15023 from tchaikov/wip-cmdparse-constness 
cmdparse: more constness

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-05-16 22:19:40 +08:00
Kefu Chai
a850dc2352 mon/MgrMonitor: use mono clock to avoid potention issue introduced by time skew 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-16 21:50:56 +08:00
Kefu Chai
9061c8933e mon/MgrMonitor: send digests only if is_active() 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-16 21:50:56 +08:00
Kefu Chai
a80ff0128a mon/MgrMonitor: cancel timer before resetting it 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-16 21:50:56 +08:00
Kefu Chai
33494b27f7 mon/MgrMonitor: s/digest_callback/digest_event/ 
to be consistent with the rest of mon

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-16 21:50:56 +08:00
Sage Weil
035c398487 Merge pull request #15112 from jcsp/wip-19940 
ceph-create-keys: update client.admin if it already exists

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-16 08:43:18 -05:00
Matt Benjamin
fc286d6115 Merge pull request #15097 from linuxbox2/wip-rgwfile-write3 
rgw_file: v3: fix write-timer action
 2017-05-16 09:07:09 -04:00
Mykola Golub
c0c644333b test/librbd: make unit tests pass when cache is disabled 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2017-05-16 14:39:41 +02:00
Mykola Golub
c065cbdb20 test/librbd: TestMockImageRemoveRequest gmock warnings 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2017-05-16 14:39:37 +02:00
Drunkard Zhang
63855e381e doc: add hyperlink on ACL settings 
The link listed at bottom but never used, I think it's missed by author.

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
 2017-05-16 20:32:29 +08:00