RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 14:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,707 Commits 211 Branches 0 Tags 1.4 GiB
0d98e649b0
Commit Graph

52707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kefu Chai
0d98e649b0 Merge pull request #8872 from dachary/wip-make-check 
tests: enable make check on ext4 (part 2)

Reviewed-by: Kefu Chai <kefu@redhat.com>
 2016-05-02 18:02:37 +08:00
Loic Dachary
b0b3a068d4 tests: enable make check on ext4 (part 2) 
Followup of 475cc08c33

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2016-05-02 11:02:59 +02:00
Loic Dachary
5dbe31913c Merge pull request #8851 from liewegas/wip-make-check 
qa/workunits/ceph-helpers.sh: make ceph-osd behave on ext4

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-05-02 10:41:48 +02:00
Sage Weil
2265d0ebc2 Merge pull request #8859 from liewegas/wip-fix-scrub 
include/rados: fix scrub-map definition

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-05-01 12:14:08 -04:00
Sage Weil
3045bde162 include/rados: fix scrub-map definition 
In commit 40add6a63d we
changed the scrub-map op code, breaking compatibility.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-01 11:07:55 -04:00
Sage Weil
79c01b812f Merge pull request #8842 from SUSE/wip-msd-typo-fix 
systemd: fix typo in preset file

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-30 21:11:43 -04:00
Sage Weil
cdaa9e22e1 ceph_time: add operator<< for more clock types 
ceph_time: add operator<< for more clock types

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-30 19:24:59 -04:00
Sage Weil
491b2644e3 Revert "Merge pull request #8346 from yuyuyu101/wip-async-clock" 
This reverts commit 37117823d1, reversing
changes made to 5ff4988c09.

This broke the build:

msg/async/Event.cc: In member function 'int EventCenter::process_time_events()':
error: msg/async/Event.cc:280:30: cannot bind 'std::basic_ostream' lvalue to 'std::basic_ostream&&'
ldout(cct, 10) << __func__ << " cur time is " << now << dendl;
^

and elsewhere...

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-30 19:21:02 -04:00
Sage Weil
475cc08c33 qa/workunits/ceph-helpers.sh: make ceph-osd behave on ext4 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-30 17:12:05 -04:00
Kefu Chai
a24912a9fe ceph_time: add operator<< for more clock types 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-05-01 02:55:01 +08:00
Kefu Chai
45b8f830c0 Merge pull request #8838 from cbodley/wip-cmake-rbd-mirror-replay-status 
cmake: add missing source file to rbd_mirror/image_replayer

Reviewed-by: Kefu Chai <kefu@redhat.com>
 2016-05-01 02:37:03 +08:00
Nathan Cutler
80be4a8cbf systemd: fix typo in preset file 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-04-30 16:21:13 +02:00
Haomai Wang
37117823d1 Merge pull request #8346 from yuyuyu101/wip-async-clock 
msg/async/Event: replace ceph_clock_now with coarse_mono_clock

Reviewed-by: Kefu Chai <kefu@redhat.com>
 2016-04-30 16:09:41 +08:00
Sage Weil
5ff4988c09 Merge pull request #8109 from majianpeng/bluestore-cleancode 
os/bluestore/BlueStore: cleanup code

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-29 21:54:30 -04:00
Sage Weil
28835b2acf Merge pull request #8110 from majianpeng/bluestore-aio-log 
os/bluestore/KernelDevice: Fio aio_write, it call _aio_log_finish by …

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-29 21:54:21 -04:00
Sage Weil
7761fe528f Merge pull request #8416 from vumrao/wip-vumrao-15308 
librados: modify Pipe::connect() to return the error code - part 1

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-29 21:50:42 -04:00
Sage Weil
289c10c9c7 Merge pull request #8532 from xiexingguo/xxg-wip-misc 
osd: miscellaneous fixes

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-29 21:50:01 -04:00
Sage Weil
8dc0fb9168 Merge pull request #8599 from yangdongsheng/on_abort 
os: fix submit_transaction return codes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-04-29 21:49:28 -04:00
Sage Weil
9f4e69c91d Merge pull request #8629 from tchaikov/wip-rados_ping_monitor 
librados: always set the outstrlen for rados_ping_monitor()

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-29 21:48:58 -04:00
Sage Weil
2b52c07daa Merge pull request #8677 from tchaikov/wip-graylog-cleanup 
log: remove unnecessary src/log/Graylog.*

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-29 21:48:50 -04:00
Sage Weil
ee24aa7f67 Merge pull request #8693 from cooboos/perf-reset 
common: show success/fail info in json for 'perf reset' command

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-04-29 21:48:28 -04:00
Sage Weil
c5790481c1 Merge pull request #8731 from Yan-waller/yj-wip-fixkqueue 
msg/async: fix some return values and typo.

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-29 21:48:11 -04:00
Casey Bodley
2f3f56170a cmake: add missing source file to rbd_mirror/image_replayer 
fixes an undefined reference when linking librbd_mirror_internal.a

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-04-29 17:33:09 -04:00
Josh Durgin
48a1d27495 Merge pull request #8454 from jdurgin/wip-mirror-test2 
rbd_mirror.sh: add env vars to allow running under teuthology

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-04-29 13:26:22 -07:00
Sage Weil
88761322b2 Merge pull request #8836 from athanatos/wip-15655 
mon/OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-29 16:12:47 -04:00
Sage Weil
45feec92f4 Merge pull request #8648 from ffilz/master 
libcephfs: add ceph_ll_mknod wrapper for ll_mknod

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-29 14:41:30 -04:00
Ali Maredia
324293f17a Merge pull request #8820 from ceph/wip-cmake-compression 
cmake: fix linking of compressor and plugins

Reviewed-by: Ali Maredia
 2016-04-29 13:47:00 -04:00
Ali Maredia
003c07a30b Merge pull request #8822 from cbodley/wip-cmake-tmp-virtualenv 
cmake: put virtualenv directories under /tmp

Reviewed-by: Ali Maredia <amaredia@redhat.com>
 2016-04-29 13:44:22 -04:00
Casey Bodley
3d1801ebbb cmake: fix for unittest_async_compressor 
this test wasn't creating the lib/compressor subdirectory, so it
depended on test_compressor_plugin_zlib or test_compressor_plugin_snappy
being run first

added the same dirty hack to copy libceph_snappy.so into lib/compressor,
and added a dependency on ceph_snappy to make sure it's built

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-04-29 13:42:12 -04:00
Casey Bodley
089e87fbe1 cmake: fix linking of compressor and plugins 
libcommon now includes the compressor objects necessary to load
compressor plugins

also removed extra dependencies on the plugins and their unit tests

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-04-29 13:42:12 -04:00
Josh Durgin
dcd11a1f26 qa/workunits/rbd: add env vars to adapt rbd_mirror.sh to teuthology 
With these set, this script can work in teuthology, where we want to
control the how daemons run and their log locations, valgrind
settings, etc. The workunit task always sets CEPH_ID, and allows
other env vars to be configured optionally.

The RBD_MIRROR_USE_EXISTING_CLUSTER option can also speed up local testing.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-29 10:01:51 -07:00
Josh Durgin
5fe64fa806 qa: rbd_mirror.sh: change parameters to cluster rather than daemon name 
Daemon name is only useful to differentiate asok and pid filenames, so
just inline its use there. Everywhere else replace the 'daemon'
parameter with cluster or local_cluster as appropriate.

Remove the CLUSTER{1,2}_DAEMON vars as well, since they are no longer
used.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-29 10:01:29 -07:00
Josh Durgin
9cdd61c198 Merge pull request #8817 from dillaman/wip-15572 
librbd: reduce log level for errors encountered disabling object-map while flatten is in-progress

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-29 11:50:30 -05:00
Josh Durgin
a9c8eb1f99 Merge pull request #8819 from dillaman/wip-14540 
rbd: disk usage now includes all snapshots by default

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-29 11:49:43 -05:00
Casey Bodley
1342ea80d5 cmake: put virtualenv directories under TMPDIR 
this was required for cmake-check to find ceph-disk and ceph-detect-init
in the PATH

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-04-29 12:23:35 -04:00
Jason Dillaman
6cb1ff491e Merge pull request #8442 from trociny/wip-rbd-mirror-status 
rbd-mirror: replay status now available via the rbd api and cli

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-29 12:11:21 -04:00
Jason Dillaman
66dbbda14f ObjectCacher: don't loop the extents of OSDWrite in map_writeReviewed-by 
ObjectCacher: don't loop the extents of OSDWrite in map_write

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-29 09:59:18 -05:00
Jason Dillaman
f6f5515273 Merge pull request #7830 from yuyuyu101/wip-14907 
IoCtxImpl: delete C_WatchCB2 when free LingerOp

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-29 08:39:34 -05:00
Jason Dillaman
9688f24e1a Merge pull request #8635 from runsisi/wip-fix-md-list 
cls_rbd: fix loop condition when listing image metadata

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-29 08:38:46 -05:00
Jason Dillaman
dd459e701d Merge pull request #8661 from runsisi/wip-fix-snapc-validation 
librbd: put the validation of image snap context earlier

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-29 08:38:34 -05:00
Sage Weil
a1b14e9a72 Merge pull request #7800 from renhwsky/renhw-wip-osdmonitor-have_pending_crush 
mon/OSDMonitor: _have_pending_crush of return value should be bool

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-04-29 08:43:05 -04:00
Mykola Golub
f15cd51a1d qa/workunits/rbd: test mirror status in pool directory 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-04-29 11:47:49 +03:00
Mykola Golub
e4229d1d4b rbd-mirror: in replay status store number of entries behind master 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-04-29 11:47:49 +03:00
Jason Dillaman
4f3765c573 Merge pull request #8305 from tchaikov/wip-fix-vstart 
vstart: make -k with optional mon_num (part 2)

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-28 23:01:07 -05:00
huanwen ren
023b45af5e osd/osdmonitor: _have_pending_crush of return value should be bool 
have_pending_crush of return value should be bool, fix it

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
 2016-04-29 10:53:14 +08:00
Sage Weil
ac9b8b2d2d Merge pull request #8823 from aderumier/deb-default-tcmalloc-cache-size 
etc/default/ceph: set 128MB tcmalloc cache size

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-28 21:47:07 -04:00
Alexandre Derumier
d1d144c03b set 128MB tcmalloc cache size by bytes 2016-04-29 03:30:05 +02:00
Samuel Just
c121bc51a5 OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1 
Fixes: http://tracker.ceph.com/issues/15655
Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-04-28 14:04:19 -07:00
Alexandre Derumier
9decbd1026 etc/default/ceph: set 128MB tcmalloc cache size 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
 2016-04-28 23:03:09 +02:00
Jason Dillaman
1ccdcb5b6c rbd: disk usage now includes all snapshots by default 
Added a new "--from-snap" optional to restrict the calculation to
specific subsets of snapshots and the HEAD revision.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-28 15:58:05 -04:00