RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 05:53:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,908 Commits 211 Branches 394 Tags 1.4 GiB
64da723d4a
Commit Graph

52908 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
Mykola Golub
4c28fc2aa3 qa/workunits/rbd: fix rbd-mirror log file name 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-05-01 22:04:46 +03: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
Mykola Golub
21790484dc rbd-mirror: make image replayer asok commands available when not started 
Initially the asok commands were registered only after the image
replayer start (and unregistered on stop) because their names were
built using remote pool and image names, which became known only after
start.

Now, the asok commands are registered on the image replayer construction
using the temporary name "remote_pool_name/global_image_id". They are
re-registered using "remote_pool_name/remote_image_name" when the
image replayer is started.  Also the commands are not unregistered on
the image replayer stop.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-05-01 18:33:54 +03: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
Haomai Wang
79343a8a09 Event: replace ceph_clock_now with coarse_real_clock 
reduce cpu utilization on real clock latency

Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-05-01 08:33:34 +08: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
John Spray
e9b58e7ff9 mds: remove stale comments 
A little bit of detritus from the MDS->MDSRank refactor.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-04-30 19:25:39 +01:00
John Spray
30a375ebf8 mds: remove inc array from mdsmap 
Instead, use the MDSMap epochs to provide the `inc` that
we populate into mds_info_t for use by the daemons.

It is not necessary to respect the current value of inc
in old maps, because the per-rank counters were necessarily
lower numbers than the overall map epoch (incrementing
the counters always corresponded to a map change).

Fixes: http://tracker.ceph.com/issues/15399
Signed-off-by: John Spray <john.spray@redhat.com>
 2016-04-30 19:25:21 +01:00
Michal Jarzabek
b090015895 common/Graylog.h: remove lexical cast 
We can use std::to_string instead of boost's lexical_cast, which saves
us from including lexical_cast header.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-04-30 16:26:11 +01: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
cy.l@inwinstack.com
f8f6c1dc86 Fix RBD-NBD aio_callback error handling 
Tracker-Id: #15604

Signed-off-by: Chang-Yi Lee <cy.l@inwinstack.com>
 2016-04-30 15:11:18 +08:00
Sage Weil
84bd0dce18 mon/OSDMonitor: max_osds must be > 0 for reweight-by-* 
Include a few test cases.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-29 22:01:56 -04: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
8b42294d98 osd/PG: update info.stats.* mappings on split 
These are updated in the init and start_peering_interval paths, but not
on split.

Fixes: http://tracker.ceph.com/issues/15523
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-29 15:24:09 -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
Wei Jin
f2c0e09c40 osd: clean heartbeat dispatch message 
this message should never happen in heartbeat messenger.

Signed-off-by: Wei Jin <wjin.cn@gmail.com>
 2016-04-30 01:12:04 +08: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
Wei Jin
6f1f717446 fast dispatch heartbeat message 
Signed-off-by: Wei Jin <wjin.cn@gmail.com>
 2016-04-29 23:35:08 +08: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