RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-24 12:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,087 Commits 211 Branches 394 Tags 1.2 GiB
25eced4c65
Commit Graph

53087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Casey Bodley
25eced4c65 Merge pull request #8981 from ceph/wip-rgw-test-fix 
test/rgw: fix bucket checkpoint

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-05-09 11:25:32 -04:00
Kefu Chai
f7331fdc3f Merge pull request #8786 from tchaikov/wip-btrfs-sudo 
test: sudo to rm btrfs subvol

Reviewed-by: Erwan Velu <erwan@redhat.com>
 2016-05-09 22:38:07 +08:00
Orit Wasserman
367bd0aec9 Merge pull request #8994 from theanalyst/fix/15776 
rgw: log name instead of id for SystemMetaObj on failure
 2016-05-09 16:36:43 +02:00
Sage Weil
c27c684b16 Merge pull request #8919 from stiopaa1/log_moveToPrivateOsdService 
osd/OSD.h: change some data members to private

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-09 09:51:19 -04:00
Sage Weil
162b4fb7d0 Merge pull request #8989 from flyd1005/wip-fix-python-warnings 
cleanup: python: remove warnings of 'trailing whitespace' and 'new blank line at EOF'
 2016-05-09 09:50:46 -04:00
Sage Weil
bd4a3b1b3e Merge pull request #8992 from runsisi/wip-fix-dup-keygen 
cls_journal: remove duplicated key generation

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-09 09:49:54 -04:00
Sage Weil
453852642a Merge pull request #8991 from emenguy/doc_test-reweight-by-utilization 
doc: adding test-reweight-by-utilization documentation
 2016-05-09 09:48:52 -04:00
Sage Weil
1712dd5fd8 Merge pull request #8984 from stiopaa1/osd_removeUnorderedSet 
osd/OSD.h: remove unneeded include file

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-09 09:38:12 -04:00
Sage Weil
09f572064c Merge pull request #8097 from aclamk/crushtool-pool-id 
crushtool: add ability of precise testing of placement group calculation.

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-09 09:15:24 -04:00
Sage Weil
810a8ca2a3 Merge pull request #8832 from stiopaa1/log_graylogmove 
common/Graylog.cc: use std move to avoid copy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-05-09 09:14:55 -04:00
Sage Weil
c88a931212 Merge pull request #8920 from XinzeChi/wip-race-shutdown 
osd: fix deadlock in OSD::_committed_osd_maps

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-09 09:14:10 -04:00
Sage Weil
4d10cb86bd Merge pull request #8922 from runsisi/wip-fix-lockdep-assert 
lockdep: fix assertion expression if ran out of lock ids

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-05-09 09:13:26 -04:00
Sage Weil
c68357f0cf Merge pull request #8967 from liewegas/wip-15760 
osdc/Objecter: upper bound watch_check result

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-05-09 09:12:49 -04:00
Sage Weil
a28b71e3c9 Merge pull request #8357 from liewegas/wip-osd-prestart 
osd: update crush_location from ceph-osd on startup

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-05-09 08:59:05 -04:00
Sage Weil
0a6d0c61d7 Merge pull request #8194 from tanghaodong25/fix_4 
os/bluestore/KernelDevice.cc: small fix in buffer flush

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-05-09 08:58:33 -04:00
Sage Weil
bfa5461265 Merge pull request #8349 from Aran85/prepare_entry_cleanup 
os/filestore: prepare entry cleanup

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-09 08:57:51 -04:00
Sage Weil
d2cab3a898 osd: create osd id if it does not exist 
Most tools create the osd id before trying to start ceph-osd.  Notably,
teuthology does not.  We could fix that, but we would be changing behavior,
as the osd boot will happily create the osd id on the fly for us.  Other
provisioning tools might rely on that behavior.  Instead, just allocate
the id sooner in the process (if necessary).

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-09 08:55:00 -04:00
Sage Weil
cf4ec5a8aa osd: change osd_crush_initial_weight = 0 to mean weight to 0 
Negative now means auto-weight, 0 means weight to 0.  Change the
default accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-09 08:55:00 -04:00
Sage Weil
573c349245 osd: update crush_location on startup from ceph-osd 
Update the crush location from ceph-osd instead of relying on
kludgey bash in ceph-osd-prestart.sh.  Among other things, this
lets us get accurate statfs information from the ObjectStore
implementation instead of relying on 'df'.

Fixes: http://tracker.ceph.com/issues/15213
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-09 08:54:44 -04:00
Sage Weil
4587a379a3 osdc/Objecter: use cct's crush_location 
Keep the observer so that we refresh our copy of the multimap.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-09 08:54:44 -04:00
Sage Weil
db6e9bedf1 global: init crush_location on daemon start 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-09 08:54:44 -04:00
Sage Weil
3d71eda4b8 common/ceph_context: add CrushLocation to cct 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-09 08:54:44 -04:00
Sage Weil
6216461915 crush/CrushLocation: add class to manage crush_location 
The crush_location can come from an explicitly set config,
a hook, or a simple fabricated default (root=default host=...).

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-09 08:54:44 -04:00
Sage Weil
7a17863c73 Merge pull request #8684 from vuhuong/wip-radosaio-copyout-data-xio 
librados: copy out data to users' buffer for xio

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
 2016-05-09 08:52:56 -04:00
Sage Weil
01a40155a7 Merge pull request #8759 from xiexingguo/xxg-wip-fixobjecterrace 
osdc/Objecter: fix race condition for sortbitwise flag detection

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-09 08:51:30 -04:00
Sage Weil
99295cab83 Merge pull request #8826 from liewegas/wip-bluestore-bitmap-freelist 
os/bluestore: bitmap-based freelist using merge operator

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-05-09 08:50:23 -04:00
Abhishek Lekshmanan
a3fdd26b02 rgw: drop unnecessary spacing in rgw zg init log 
Dropping unneeded space when we're printing the failed reading zg info
message

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-05-09 14:05:06 +02:00
Abhishek Lekshmanan
aee1d643be rgw: log name instead of id for SystemMetaObj on failure 
Currently if we fail to read a SystemMetaObj we try to log the
MetaObject id, however this will not be set mostly as read_id has
failed, so we end up logging an empty id, changing this to log
the object name instead

Fixes: http://tracker.ceph.com/issues/15776
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-05-09 11:41:19 +02:00
Etienne Menguy
6bab8cf362
adding test-reweight-by-utilization documentation 
Signed-off-by: Etienne Menguy <etienne.menguy@corp.ovh.com>
 2016-05-09 10:49:47 +02:00
runsisi
715e99c83e cls_journal: remove duplicated key generation 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2016-05-09 15:15:31 +08:00
Li Peng
9c2d785382 cleanup: python: remove warnings of 'new blank line at EOF' 
When applying ceph patches, some warnings reported, e.g.
qa/workunits/mon/caps.py:367: new blank line at EOF.

Signed-off-by: Li Peng <lip@dtdream.com>
 2016-05-09 11:28:42 +08:00
Li Peng
969c6d464c cleanup: python: remove warnings of 'trailing whitespace' 
When applying ceph patches, some warnings reported, e.g.
doc/scripts/gen_state_diagram.py:99: trailing whitespace.

Signed-off-by: Li Peng <lip@dtdream.com>
 2016-05-09 11:25:08 +08:00
Michal Jarzabek
3a5f4c5c89 osd/OSD.h: remove unneeded include file 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-05-07 13:54:24 +01:00
Yehuda Sadeh
5d3882d565 test/rgw: fix bucket checkpoint 
Can refer to the incremental sync marker only if bucket is in the incremental
sync state.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-05-06 15:32:50 -07:00
Michal Jarzabek
083417fb41 osd/OSD.h: change some data members to private 
Move some data members of the OSDService from public to private access
specifier.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-05-06 21:41:19 +01:00
Sage Weil
646a6a28c3 Merge pull request #8912 from markhpc/wip-promote-throttle-fix 
osd: fix reversed promote throttle default parameters

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-05-06 15:13:56 -04:00
Sage Weil
cdae4a3011 Merge pull request #8902 from xiexingguo/xxg-wip-cheanup-osdmon 
mon/OSDMonitor: kill dead code

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-06 15:13:26 -04:00
Sage Weil
83ae5d6ab3 Merge pull request #8290 from yangdongsheng/chain_xattr 
Fix unittest for chain_xattr.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
 2016-05-06 15:13:01 -04:00
Sage Weil
702f523228 Merge pull request #8173 from ceph/buffer-api-visibility 
buffer: fix iterator_impl visibility through typedef

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-05-06 15:12:08 -04:00
Sage Weil
a99fae9dc1 Merge pull request #8289 from majianpeng/bluestore-zero-clear-tail-cache 
os/bluestore/BlueStore: For _zero, check whether clear tail_bl.

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-06 15:11:31 -04:00
Samuel Just
b158fa6f5a Merge pull request #8977 from liewegas/wip-ceph-tool 
qa/workunits/rados/test_rados_tool: fix copy paste error

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-05-06 12:01:35 -07:00
Gregory Farnum
8cbfb00d4c Merge pull request #8388 from dreamhost/wip-buildfix-mds-test 
mds: build fix for LIBMDS consumer.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-05-06 11:57:44 -07:00
Sage Weil
7f1bc1b038 qa/workunits/rados/test_rados_tool: fix copy paste error 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-06 14:54:41 -04:00
Jason Dillaman
a122569dfd tests/rbd: add option to leave behind fsx test data 
tests/rbd: add option to leave behind fsx test data

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-05-06 13:42:04 -04:00
Douglas Fuller
c33d0cbcd0 tests/rbd: add option to leave behind fsx test data 
Previously, fsx deleted all test data upon successful completion. Add
an option to leave the data behind for further analysis.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
 2016-05-06 10:36:00 -07:00
Kefu Chai
73e22784dd Merge pull request #8936 from bstillwell/manual-install-doc-fixes1 
doc: install/manual-deployment: use sudo on some commands

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-05-07 00:55:21 +08:00
Sage Weil
9fb8b103de Merge pull request #8950 from stiopaa1/osd_passSharedByRef_shouldsharemap 
osd/OSD: pass shared pointer by const reference

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-06 11:49:36 -04:00
Kefu Chai
80b6660abd Merge pull request #8962 from beess/doc-fix1 
doc: Fixes three hyphen errors and a syntax error.

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-05-06 22:03:11 +08:00
Sage Weil
c73b2f408c Merge pull request #8934 from liewegas/wip-bluestore-extent-flags 
os/bluestore: drop transient extent flags

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-05-06 09:25:11 -04:00
Sage Weil
2e2ce36586 osdc/Objecter: upper bound watch_check result 
This way we always return a safe upper bound on the amount of time
since we did a check.  Among other things, this prevents us from
returning a value of 0, which is confusing.

Fixes: http://tracker.ceph.com/issues/15760
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-06 09:09:43 -04:00